This is an automated email from the ASF dual-hosted git repository.
sureshanaparti pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 6fa8538 Adding placeholders for custom NSP vues (#5620)
6fa8538 is described below
commit 6fa85386663039346184554b769dcdeee83559cd
Author: davidjumani <[email protected]>
AuthorDate: Thu Jan 27 20:11:35 2022 +0530
Adding placeholders for custom NSP vues (#5620)
* Adding placeholders for custom NSP vues
* Fix decorator
* Fixing gslbproviderprivateip description
---
.../com/cloud/api/commands/AddNetscalerLoadBalancerCmd.java | 2 +-
ui/src/views/infra/network/providers/AddF5LoadBalancer.vue | 8 ++++++++
.../infra/network/providers/AddNetscalerLoadBalancer.vue | 11 +++++++++++
ui/src/views/infra/network/providers/AddNiciraNvpDevice.vue | 10 ++++++++++
ui/src/views/infra/network/providers/AddPaloAltoFirewall.vue | 8 ++++++++
ui/src/views/infra/network/providers/AddSrxFirewall.vue | 8 ++++++++
6 files changed, 46 insertions(+), 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 2a74806..f1a6cd4 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,
diff --git a/ui/src/views/infra/network/providers/AddF5LoadBalancer.vue
b/ui/src/views/infra/network/providers/AddF5LoadBalancer.vue
index 227520c..a03a421 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 7e12f54..d8ed81d 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 60a33b5..e1a9a9d 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 aff9d57..6d40cc3 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 8a61d5f..be50cf0 100644
--- a/ui/src/views/infra/network/providers/AddSrxFirewall.vue
+++ b/ui/src/views/infra/network/providers/AddSrxFirewall.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')
}]
}]"
@@ -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
