From 0d86e7d58434300638dba0b37870688001bfd07b Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Mon, 25 Oct 2021 10:40:51 +0530
Subject: [PATCH 1/3] Adding placeholders for custom NSP vues

---
 .../infra/network/providers/AddF5LoadBalancer.vue     |  8 ++++++++
 .../network/providers/AddNetscalerLoadBalancer.vue    | 11 +++++++++++
 .../infra/network/providers/AddNiciraNvpDevice.vue    | 10 ++++++++++
 .../infra/network/providers/AddPaloAltoFirewall.vue   |  8 ++++++++
 .../views/infra/network/providers/AddSrxFirewall.vue  | 10 +++++++++-
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/ui/src/views/infra/network/providers/AddF5LoadBalancer.vue b/ui/src/views/infra/network/providers/AddF5LoadBalancer.vue
index 0332ad2b15b7..37e0b60929b7 100644
--- a/ui/src/views/infra/network/providers/AddF5LoadBalancer.vue
+++ b/ui/src/views/infra/network/providers/AddF5LoadBalancer.vue
@@ -25,6 +25,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.ip')">
             <a-input
+              :placeholder="apiParams.url.description"
               autoFocus
               v-decorator="['ip', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
@@ -36,6 +37,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.username')">
             <a-input
+              :placeholder="apiParams.username.description"
               v-decorator="['username', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -46,6 +48,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.password')">
             <a-input-password
+              :placeholder="apiParams.password.description"
               v-decorator="['password', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -56,6 +59,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.networkdevicetype')">
             <a-select
+              :placeholder="apiParams.networkdevicetype.description"
               v-decorator="['networkdevicetype', {
                 rules: [{ required: true, message: $t('message.error.select') }]
               }]"
@@ -135,6 +139,7 @@ export default {
   },
   data () {
     return {
+      apiParams: {},
       loading: false,
       nsp: {}
     }
@@ -153,6 +158,9 @@ export default {
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
+  created () {
+    this.apiParams = this.$getApiParams('addF5LoadBalancer')
+  },
   mounted () {
     if (this.resource && Object.keys(this.resource).length > 0) {
       this.nsp = this.resource
diff --git a/ui/src/views/infra/network/providers/AddNetscalerLoadBalancer.vue b/ui/src/views/infra/network/providers/AddNetscalerLoadBalancer.vue
index aa0699acbe87..906581624702 100644
--- a/ui/src/views/infra/network/providers/AddNetscalerLoadBalancer.vue
+++ b/ui/src/views/infra/network/providers/AddNetscalerLoadBalancer.vue
@@ -25,6 +25,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.ip')">
             <a-input
+              :placeholder="apiParams.url.description"
               autoFocus
               v-decorator="['ip', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
@@ -36,6 +37,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.username')">
             <a-input
+              :placeholder="apiParams.username.description"
               v-decorator="['username', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -46,6 +48,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.password')">
             <a-input-password
+              :placeholder="apiParams.password.description"
               v-decorator="['password', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -56,6 +59,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.networkdevicetype')">
             <a-select
+              :placeholder="apiParams.networkdevicetype.description"
               v-decorator="['networkdevicetype', {
                 rules: [{ required: true, message: $t('message.error.select') }]
               }]"
@@ -91,6 +95,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.gslbprovider')">
             <a-switch
+              :placeholder="apiParams.gslbprovider.description"
               v-decorator="['gslbprovider', { initialValue: false }]" />
           </a-form-item>
         </a-col>
@@ -99,6 +104,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.gslbproviderpublicip')">
             <a-input
+              :placeholder="apiParams.gslbproviderpublicip.description"
               v-decorator="['gslbproviderpublicip']" />
           </a-form-item>
         </a-col>
@@ -107,6 +113,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.gslbproviderprivateip')">
             <a-input
+              :placeholder="apiParams.gslbproviderprivateip.description"
               v-decorator="['gslbproviderprivateip']" />
           </a-form-item>
         </a-col>
@@ -159,6 +166,7 @@ export default {
   },
   data () {
     return {
+      apiParams: {},
       loading: false,
       nsp: {}
     }
@@ -185,6 +193,9 @@ export default {
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
+  created () {
+    this.apiParams = this.$getApiParams('addNetscalerLoadBalancer')
+  },
   mounted () {
     if (this.resource && Object.keys(this.resource).length > 0) {
       this.nsp = this.resource
diff --git a/ui/src/views/infra/network/providers/AddNiciraNvpDevice.vue b/ui/src/views/infra/network/providers/AddNiciraNvpDevice.vue
index 01c21fb3fd77..7e7cdb91b31b 100644
--- a/ui/src/views/infra/network/providers/AddNiciraNvpDevice.vue
+++ b/ui/src/views/infra/network/providers/AddNiciraNvpDevice.vue
@@ -26,6 +26,7 @@
           <a-form-item :label="$t('label.ip')">
             <a-input
               autoFocus
+              :placeholder="apiParams.hostname.description"
               v-decorator="['ip', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -36,6 +37,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.username')">
             <a-input
+              :placeholder="apiParams.username.description"
               v-decorator="['username', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -46,6 +48,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.password')">
             <a-input-password
+              :placeholder="apiParams.password.description"
               v-decorator="['password', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -65,6 +68,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.transportzoneuuid')">
             <a-input
+              :placeholder="apiParams.transportzoneuuid.description"
               v-decorator="['transportzoneuuid']" />
           </a-form-item>
         </a-col>
@@ -73,6 +77,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.l3gatewayserviceuuid')">
             <a-input
+              :placeholder="apiParams.l3gatewayserviceuuid.description"
               v-decorator="['l3gatewayserviceuuid']" />
           </a-form-item>
         </a-col>
@@ -81,6 +86,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.l2gatewayserviceuuid')">
             <a-input
+              :placeholder="apiParams.l2gatewayserviceuuid.description"
               v-decorator="['l2gatewayserviceuuid']" />
           </a-form-item>
         </a-col>
@@ -110,6 +116,7 @@ export default {
   },
   data () {
     return {
+      apiParams: {},
       loading: false,
       nsp: {}
     }
@@ -117,6 +124,9 @@ export default {
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
+  created () {
+    this.apiParams = this.$getApiParams('addNiciraNvpDevice')
+  },
   mounted () {
     if (this.resource && Object.keys(this.resource).length > 0) {
       this.nsp = this.resource
diff --git a/ui/src/views/infra/network/providers/AddPaloAltoFirewall.vue b/ui/src/views/infra/network/providers/AddPaloAltoFirewall.vue
index fe6a11378d31..d11da2482173 100644
--- a/ui/src/views/infra/network/providers/AddPaloAltoFirewall.vue
+++ b/ui/src/views/infra/network/providers/AddPaloAltoFirewall.vue
@@ -26,6 +26,7 @@
           <a-form-item :label="$t('label.ip')">
             <a-input
               autoFocus
+              :placeholder="apiParams.url.description"
               v-decorator="['ip', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -36,6 +37,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.username')">
             <a-input
+              :placeholder="apiParams.username.description"
               v-decorator="['username', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -46,6 +48,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.password')">
             <a-input-password
+              :placeholder="apiParams.password.description"
               v-decorator="['password', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -56,6 +59,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.networkdevicetype')">
             <a-select
+              :placeholder="apiParams.networkdevicetype.description"
               v-decorator="['networkdevicetype', {
                 rules: [{ required: true, message: $t('message.error.select') }]
               }]"
@@ -182,6 +186,7 @@ export default {
   },
   data () {
     return {
+      apiParams: {},
       loading: false,
       nsp: {}
     }
@@ -200,6 +205,9 @@ export default {
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
+  created () {
+    this.apiParams = this.$getApiParams('addPaloAltoFirewall')
+  },
   mounted () {
     if (this.resource && Object.keys(this.resource).length > 0) {
       this.nsp = this.resource
diff --git a/ui/src/views/infra/network/providers/AddSrxFirewall.vue b/ui/src/views/infra/network/providers/AddSrxFirewall.vue
index e50e14f0909f..bfafae488f1e 100644
--- a/ui/src/views/infra/network/providers/AddSrxFirewall.vue
+++ b/ui/src/views/infra/network/providers/AddSrxFirewall.vue
@@ -25,8 +25,9 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.ip')">
             <a-input
+              :placeholder="apiParams.url.description"
               autoFocus
-              v-decorator="['ip', {
+              v-decorator="['url', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
           </a-form-item>
@@ -36,6 +37,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.username')">
             <a-input
+              :placeholder="apiParams.username.description"
               v-decorator="['username', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -46,6 +48,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.password')">
             <a-input-password
+              :placeholder="apiParams.password.description"
               v-decorator="['password', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
@@ -56,6 +59,7 @@
         <a-col :md="24" :lg="24">
           <a-form-item :label="$t('label.networkdevicetype')">
             <a-select
+              :placeholder="apiParams.networkdevicetype.description"
               v-decorator="['networkdevicetype', {
                 rules: [{ required: true, message: $t('message.error.select') }]
               }]"
@@ -160,6 +164,7 @@ export default {
   },
   data () {
     return {
+      apiParams: {},
       loading: false,
       nsp: {}
     }
@@ -178,6 +183,9 @@ export default {
   beforeCreate () {
     this.form = this.$form.createForm(this)
   },
+  created () {
+    this.apiParams = this.$getApiParams('addSrxFirewall')
+  },
   mounted () {
     if (this.resource && Object.keys(this.resource).length > 0) {
       this.nsp = this.resource

From e34feccaaf11b00a51e5dc26d25071d0e64b7dd6 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Thu, 27 Jan 2022 12:03:10 +0530
Subject: [PATCH 2/3] Fix decorator

---
 ui/src/views/infra/network/providers/AddSrxFirewall.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/infra/network/providers/AddSrxFirewall.vue b/ui/src/views/infra/network/providers/AddSrxFirewall.vue
index bfafae488f1e..ce5bd04966a3 100644
--- a/ui/src/views/infra/network/providers/AddSrxFirewall.vue
+++ b/ui/src/views/infra/network/providers/AddSrxFirewall.vue
@@ -27,7 +27,7 @@
             <a-input
               :placeholder="apiParams.url.description"
               autoFocus
-              v-decorator="['url', {
+              v-decorator="['ip', {
                 rules: [{ required: true, message: $t('message.error.required.input') }]
               }]" />
           </a-form-item>

From f4cf77e50b3588edf7c14a01cba3dda6851057c6 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Thu, 27 Jan 2022 13:04:33 +0530
Subject: [PATCH 3/3] Fixing gslbproviderprivateip description

---
 .../com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
index 2a74806fe4b4..f1a6cd4b7ee6 100644
--- a/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
+++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java
@@ -83,7 +83,7 @@ public class AddNetscalerLoadBalancerCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.GSLB_PROVIDER_PUBLIC_IP, type = CommandType.STRING, required = false, description = "public IP of the site")
     private String gslbSitePublicIp;
 
-    @Parameter(name = ApiConstants.GSLB_PROVIDER_PRIVATE_IP, type = CommandType.STRING, required = false, description = "public IP of the site")
+    @Parameter(name = ApiConstants.GSLB_PROVIDER_PRIVATE_IP, type = CommandType.STRING, required = false, description = "private IP of the site")
     private String gslbSitePrivateIp;
 
     @Parameter(name = ApiConstants.EXCLUSIVE_GSLB_PROVIDER,