From 0ca1fd9f5eb40dfd412f26cf1cbeeb1b647b51c7 Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Wed, 31 Mar 2021 09:29:14 +0700
Subject: [PATCH 1/2] zone wizard: restored the basic networking

---
 ui/public/config.json                             |  3 ++-
 .../views/infra/zone/ZoneWizardZoneTypeStep.vue   | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ui/public/config.json b/ui/public/config.json
index f4fda4114262..2957320f2b9d 100644
--- a/ui/public/config.json
+++ b/ui/public/config.json
@@ -46,5 +46,6 @@
     "jp": "label.japanese.keyboard",
     "sc": "label.simplified.chinese.keyboard"
   },
-  "plugins": []
+  "plugins": [],
+  "basicZoneEnabled": false
 }
diff --git a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
index 722df4fa46c3..72b4a60dd19c 100644
--- a/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
+++ b/ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue
@@ -30,10 +30,18 @@
               initialValue: zoneType
             }]
           }]">
+          <a-card :gutter="12" class="card-item" v-if="$config.basicZoneEnabled">
+            <a-col :md="6" :lg="6">
+              <a-radio class="card-form-item" value="Basic">{{ $t('label.basic') }}</a-radio>
+            </a-col>
+            <a-col :md="18" :lg="18">
+              <a-card class="ant-form-text zone-support">{{ $t(zoneDescription.Basic) }}</a-card>
+            </a-col>
+          </a-card>
           <a-card :gutter="12" class="card-item">
             <a-col :md="6" :lg="6">
-              <a-radio style="display: none;" class="card-form-item" value="Advanced">{{ $t('label.advanced') }}</a-radio>
-              <span style="margin-top: 20px" class="card-form-item">
+              <a-radio class="card-form-item" value="Advanced" v-if="$config.basicZoneEnabled">{{ $t('label.advanced') }}</a-radio>
+              <span style="margin-top: 20px;" class="card-form-item" v-else>
                 <a-icon type="setting" style="margin-right: 10px" />
                 {{ $t('label.advanced') }}
               </span>
@@ -86,6 +94,7 @@ export default {
       wrapperCol: { span: 14 }
     },
     zoneDescription: {
+      Basic: 'message.desc.basic.zone',
       Advanced: 'message.desc.advanced.zone',
       SecurityGroups: 'message.advanced.security.group'
     }
@@ -108,7 +117,7 @@ export default {
       return this.zoneType === 'Advanced'
     },
     zoneType () {
-      return this.prefillContent.zoneType ? this.prefillContent.zoneType.value : 'Advanced'
+      return this.prefillContent.zoneType ? this.prefillContent.zoneType.value : (this.$config.basicZoneEnabled ? 'Basic' : 'Advanced')
     },
     securityGroupsEnabled () {
       return this.isAdvancedZone && (this.prefillContent.securityGroupsEnabled ? this.prefillContent.securityGroupsEnabled.value : false)

From fc6613a09c49c7dcfa2ce6393b0f145f91ae70ed Mon Sep 17 00:00:00 2001
From: utchoang <hoangnm@unitech.vn>
Date: Wed, 31 Mar 2021 09:31:48 +0700
Subject: [PATCH 2/2] set enabled Basic Networking

---
 ui/public/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/public/config.json b/ui/public/config.json
index 2957320f2b9d..08936fea8e3a 100644
--- a/ui/public/config.json
+++ b/ui/public/config.json
@@ -47,5 +47,5 @@
     "sc": "label.simplified.chinese.keyboard"
   },
   "plugins": [],
-  "basicZoneEnabled": false
+  "basicZoneEnabled": true
 }