Skip to content

Commit 7239568

Browse files
committed
Add Netris Provider to the zone creation wizard
1 parent a303c7c commit 7239568

3 files changed

Lines changed: 78 additions & 2 deletions

File tree

ui/public/locales/en.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,6 +1484,13 @@
14841484
"label.nat": "BigSwitch BCF NAT enabled",
14851485
"label.ncc": "NCC",
14861486
"label.netmask": "Netmask",
1487+
"label.netris": "Netris",
1488+
"label.netris.provider": "Netris Provider",
1489+
"label.netris.provider.name": "Netris provider name",
1490+
"label.netris.provider.hostname": "Netris provider hostname",
1491+
"label.netris.provider.port": "Netris provider port",
1492+
"label.netris.provider.username": "Netris provider username",
1493+
"label.netris.provider.password": "Netris provider password",
14871494
"label.netscaler": "NetScaler",
14881495
"label.netscaler.mpx": "NetScaler MPX LoadBalancer",
14891496
"label.netscaler.sdx": "NetScaler SDX LoadBalancer",
@@ -3190,6 +3197,7 @@
31903197
"message.import.volume": "Please specify the domain, account or project name. <br>If not set, the volume will be imported for the caller.",
31913198
"message.info.cloudian.console": "Cloudian Management Console should open in another window.",
31923199
"message.installwizard.cloudstack.helptext.website": " * Project website:\t ",
3200+
"message.infra.setup.netris.description": "This zone must contain a Netris provider because the isolation method is Netris",
31933201
"message.infra.setup.nsx.description": "This zone must contain an NSX provider because the isolation method is NSX",
31943202
"message.infra.setup.tungsten.description": "This zone must contain a Tungsten-Fabric provider because the isolation method is TF",
31953203
"message.installwizard.cloudstack.helptext.document": " * Documentation:\t ",
@@ -3207,6 +3215,10 @@
32073215
"message.installwizard.tooltip.configureguesttraffic.guestgateway": "The gateway that the guests should use.",
32083216
"message.installwizard.tooltip.configureguesttraffic.guestnetmask": "The netmask in use on the subnet that the guests should use.",
32093217
"message.installwizard.tooltip.configureguesttraffic.gueststartip": "The range of IP addresses that will be available for allocation to guests in this zone. If one NIC is used, these IPs should be in the same CIDR as the pod CIDR.",
3218+
"message.installwizard.tooltip.netris.provider.name": "Netris Provider name is required",
3219+
"message.installwizard.tooltip.netris.provider.hostname": "Netris Provider hostname / IP address not provided",
3220+
"message.installwizard.tooltip.netris.provider.username": "Netris Provider username not provided",
3221+
"message.installwizard.tooltip.netris.provider.password": "Netris Provider password not provided",
32103222
"message.installwizard.tooltip.nsx.provider.hostname": "NSX Provider hostname / IP address not provided",
32113223
"message.installwizard.tooltip.nsx.provider.username": "NSX Provider username not provided",
32123224
"message.installwizard.tooltip.nsx.provider.password": "NSX Provider password not provided",

ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue

Lines changed: 65 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,18 @@
8888
:isFixError="isFixError"
8989
/>
9090

91+
<static-inputs-form
92+
v-if="steps && steps[currentStep].formKey === 'netris'"
93+
@nextPressed="nextPressed"
94+
@backPressed="handleBack"
95+
@fieldsChanged="fieldsChanged"
96+
@submitLaunchZone="submitLaunchZone"
97+
:fields="netrisFields"
98+
:prefillContent="prefillContent"
99+
:description="netrisSetupDescription"
100+
:isFixError="isFixError"
101+
/>
102+
91103
<static-inputs-form
92104
v-if="steps && steps[currentStep].formKey === 'pod'"
93105
@nextPressed="nextPressed"
@@ -101,7 +113,6 @@
101113
/>
102114

103115
<div v-if="guestTrafficRangeMode">
104-
<div>{{ isNsxZone }}</div>
105116
<static-inputs-form
106117
v-if="steps && steps[currentStep].formKey === 'guestTraffic'"
107118
@nextPressed="nextPressed"
@@ -214,8 +225,17 @@ export default {
214225
}
215226
return isNsx
216227
},
228+
isNetrisZone () {
229+
let isNetris = false
230+
if (!this.prefillContent.physicalNetworks) {
231+
isNetris = false
232+
} else {
233+
const netrisIdx = this.prefillContent.physicalNetworks.findIndex(network => network.isolationMethod === 'NETRIS')
234+
isNetris = netrisIdx > -1
235+
}
236+
return isNetris
237+
},
217238
allSteps () {
218-
console.log(this.isNsxZone)
219239
const steps = []
220240
steps.push({
221241
title: 'label.physical.network',
@@ -233,6 +253,12 @@ export default {
233253
formKey: 'nsx'
234254
})
235255
}
256+
if (this.isNetrisZone) {
257+
steps.push({
258+
title: 'label.netris.provider',
259+
formKey: 'netris'
260+
})
261+
}
236262
if (this.havingNetscaler) {
237263
steps.push({
238264
title: 'label.netScaler',
@@ -440,6 +466,42 @@ export default {
440466
]
441467
return fields
442468
},
469+
netrisFields () {
470+
const fields = [
471+
{
472+
title: 'label.netris.provider.name',
473+
key: 'netrisName',
474+
placeHolder: 'message.installwizard.tooltip.netris.provider.name',
475+
required: true
476+
},
477+
{
478+
title: 'label.netris.provider.hostname',
479+
key: 'netrisHostname',
480+
placeHolder: 'message.installwizard.tooltip.netris.provider.hostname',
481+
required: true
482+
},
483+
{
484+
title: 'label.netris.provider.port',
485+
key: 'netrisPort',
486+
placeHolder: 'message.installwizard.tooltip.netris.provider.port',
487+
required: false
488+
},
489+
{
490+
title: 'label.netris.provider.username',
491+
key: 'username',
492+
placeHolder: 'message.installwizard.tooltip.netris.provider.username',
493+
required: true
494+
},
495+
{
496+
title: 'label.netris.provider.password',
497+
key: 'password',
498+
placeHolder: 'message.installwizard.tooltip.netris.provider.password',
499+
required: true,
500+
password: true
501+
}
502+
]
503+
return fields
504+
},
443505
guestTrafficFields () {
444506
const fields = [
445507
{
@@ -510,6 +572,7 @@ export default {
510572
podSetupDescription: 'message.add.pod.during.zone.creation',
511573
tungstenSetupDescription: 'message.infra.setup.tungsten.description',
512574
nsxSetupDescription: 'message.infra.setup.nsx.description',
575+
netrisSetupDescription: 'message.infra.setup.netris.description',
513576
netscalerSetupDescription: 'label.please.specify.netscaler.info',
514577
storageTrafficDescription: 'label.zonewizard.traffictype.storage',
515578
podFields: [

ui/src/views/infra/zone/ZoneWizardPhysicalNetworkSetupStep.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<a-select-option value="VCS"> VCS </a-select-option>
6868
<a-select-option value="TF"> TF </a-select-option>
6969
<a-select-option v-if="hypervisor === 'VMware'" value="NSX"> NSX </a-select-option>
70+
<a-select-option v-if="hypervisor === 'KVM'" value="Netris"> NETRIS </a-select-option>
7071

7172
<template #suffixIcon>
7273
<a-tooltip

0 commit comments

Comments
 (0)