From 4585f21686c005455551b21f8802b393eaadc27d Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Thu, 18 Jun 2020 11:09:54 +0530
Subject: [PATCH 1/3] Add bypassvlanoverlapcheck parameter when create private
 gateway

---
 src/config/section/network.js | 3 ++-
 src/views/network/VpcTab.vue  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/config/section/network.js b/src/config/section/network.js
index 0efcdebd6..e5ee09286 100644
--- a/src/config/section/network.js
+++ b/src/config/section/network.js
@@ -285,7 +285,8 @@ export default {
           icon: 'plus',
           label: 'label.add.private.gateway',
           listView: true,
-          args: ['physicalnetworkid', 'vlan', 'ipaddress', 'gateway', 'netmask', 'sourcenatsupported', 'aclid'],
+          // TODO : Add version check
+          args: ['physicalnetworkid', 'vlan', 'bypassvlanoverlapcheck', 'ipaddress', 'gateway', 'netmask', 'sourcenatsupported', 'aclid'],
           mapping: {
             aclid: {
               api: 'listNetworkACLLists'
diff --git a/src/views/network/VpcTab.vue b/src/views/network/VpcTab.vue
index cb80bf5b9..968b35fca 100644
--- a/src/views/network/VpcTab.vue
+++ b/src/views/network/VpcTab.vue
@@ -130,6 +130,12 @@
                   v-decorator="['vlan', {rules: [{ required: true, message: `${this.$t('label.required')}` }]}]"
                 ></a-input>
               </a-form-item>
+              // TODO : Add version check
+              <a-form-item :label="$t('label.bypassvlanoverlapcheck')">
+                <a-checkbox
+                  v-decorator="['bypassvlanoverlapcheck']"
+                ></a-checkbox>
+              </a-form-item>
               <a-form-item :label="$t('label.publicip')" :required="true">
                 <a-input
                   :placeholder="placeholders.ipaddress"

From 928303517188c8299c972af2473910380d5eb188 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Thu, 18 Jun 2020 12:58:06 +0530
Subject: [PATCH 2/3] Adding check

---
 src/config/section/network.js | 10 ++++++++--
 src/views/network/VpcTab.vue  | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/config/section/network.js b/src/config/section/network.js
index e5ee09286..2314eeda7 100644
--- a/src/config/section/network.js
+++ b/src/config/section/network.js
@@ -285,8 +285,14 @@ export default {
           icon: 'plus',
           label: 'label.add.private.gateway',
           listView: true,
-          // TODO : Add version check
-          args: ['physicalnetworkid', 'vlan', 'bypassvlanoverlapcheck', 'ipaddress', 'gateway', 'netmask', 'sourcenatsupported', 'aclid'],
+          args: (record, store) => {
+            var fields = ['physicalnetworkid', 'vlan', 'ipaddress', 'gateway', 'netmask', 'sourcenatsupported', 'aclid']
+            if (store.apis.createPrivateGateway.params.filter(x => x.name === 'bypassvlanoverlapcheck').length > 0) {
+              fields.push('bypassvlanoverlapcheck')
+            }
+            return fields
+          },
+
           mapping: {
             aclid: {
               api: 'listNetworkACLLists'
diff --git a/src/views/network/VpcTab.vue b/src/views/network/VpcTab.vue
index 968b35fca..d66105bef 100644
--- a/src/views/network/VpcTab.vue
+++ b/src/views/network/VpcTab.vue
@@ -130,8 +130,9 @@
                   v-decorator="['vlan', {rules: [{ required: true, message: `${this.$t('label.required')}` }]}]"
                 ></a-input>
               </a-form-item>
-              // TODO : Add version check
-              <a-form-item :label="$t('label.bypassvlanoverlapcheck')">
+              <a-form-item
+                :label="$t('label.bypassvlanoverlapcheck')"
+                v-if="$store.getters.apis.createPrivateGateway.params.filter(x => x.name === 'bypassvlanoverlapcheck').length > 0" >
                 <a-checkbox
                   v-decorator="['bypassvlanoverlapcheck']"
                 ></a-checkbox>
@@ -533,8 +534,7 @@ export default {
         }
 
         const data = this.gatewayForm.getFieldsValue()
-
-        api('createPrivateGateway', {
+        const params = {
           sourcenatsupported: data.nat,
           physicalnetworkid: data.physicalnetwork,
           vpcid: this.resource.id,
@@ -543,7 +543,12 @@ export default {
           netmask: data.netmask,
           vlan: data.vlan,
           aclid: data.acl
-        }).then(response => {
+        }
+        if (data.bypassvlanoverlapcheck) {
+          params.bypassvlanoverlapcheck = data.bypassvlanoverlapcheck
+        }
+
+        api('createPrivateGateway', params).then(response => {
           this.$store.dispatch('AddAsyncJob', {
             title: `Successfully added Private Gateway`,
             jobid: response.createprivategatewayresponse.jobid,

From a9e7cb77e8edd197144a835b1a0298c4eb4abfa3 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Thu, 18 Jun 2020 13:28:44 +0530
Subject: [PATCH 3/3] Add missing vpcid

---
 src/config/section/network.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/config/section/network.js b/src/config/section/network.js
index 2314eeda7..301cdf777 100644
--- a/src/config/section/network.js
+++ b/src/config/section/network.js
@@ -286,13 +286,12 @@ export default {
           label: 'label.add.private.gateway',
           listView: true,
           args: (record, store) => {
-            var fields = ['physicalnetworkid', 'vlan', 'ipaddress', 'gateway', 'netmask', 'sourcenatsupported', 'aclid']
+            var fields = ['vpcid', 'physicalnetworkid', 'vlan', 'ipaddress', 'gateway', 'netmask', 'sourcenatsupported', 'aclid']
             if (store.apis.createPrivateGateway.params.filter(x => x.name === 'bypassvlanoverlapcheck').length > 0) {
               fields.push('bypassvlanoverlapcheck')
             }
             return fields
           },
-
           mapping: {
             aclid: {
               api: 'listNetworkACLLists'