diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index c4c3751d96f..0f0b6781d51 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -102,7 +102,7 @@ "broadcastdomaintype": "Broadcast Domain Type", "broadcasturi": "Broadcast URI", "bucket": "Bucket", -"bypassVlanOverlapCheck": "Bypass VLAN id/range overlap", +"bypassvlanoverlapcheck": "Bypass VLAN id/range overlap", "cachemode": "Write-cache Type", "capacity": "Capacity", "capacityBytes": "Capacity Bytes", @@ -166,7 +166,7 @@ "diskIopsReadRate": "Disk Read Rate (IOPS)", "diskIopsWriteRate": "Disk Write Rate (IOPS)", "diskoffering": "Disk Offering", -"diskOfferingId": "Disk Offerings", +"diskofferingid": "Disk Offering", "diskSize": "Disk Size (in GB)", "diskiopstotal": "IOPS", "diskioread": "Disk Read (IO)", @@ -207,7 +207,7 @@ "esplifetime": "ESP Lifetime (second)", "esppolicy": "ESP policy", "expunge": "Expunge", -"externalId": "External Id", +"externalid": "External Id", "extra": "Extra Arguments", "fingerprint": "FingerPrint", "firstname": "First Name", @@ -319,7 +319,8 @@ "isextractable": "Extractable", "isfeatured": "Featured", "iso": "ISO", -"isolatedpvlanId": "Secondary Isolated VLAN ID", +"isolatedpvlantype": "Secondary Isolated VLAN Type", +"isolatedpvlanid": "Secondary Isolated VLAN ID", "isolationmethods": "Isolation method", "isolationuri": "Isolation URI", "isoname": "Attached ISO", diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index 318a9963d7a..3b53a44f241 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -111,10 +111,16 @@ + + {{ $t(field.name) }} + + + + + + :placeholder="field.description" /> diff --git a/ui/src/views/network/CreateIsolatedNetworkForm.vue b/ui/src/views/network/CreateIsolatedNetworkForm.vue new file mode 100644 index 00000000000..ca5da480f48 --- /dev/null +++ b/ui/src/views/network/CreateIsolatedNetworkForm.vue @@ -0,0 +1,472 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + diff --git a/ui/src/views/network/CreateL2NetworkForm.vue b/ui/src/views/network/CreateL2NetworkForm.vue new file mode 100644 index 00000000000..472a0bcace2 --- /dev/null +++ b/ui/src/views/network/CreateL2NetworkForm.vue @@ -0,0 +1,393 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue index a2f9e9ae5d3..15bb4662534 100644 --- a/ui/src/views/network/CreateNetwork.vue +++ b/ui/src/views/network/CreateNetwork.vue @@ -16,25 +16,118 @@ // under the License. - diff --git a/ui/src/views/network/CreateSharedNetworkForm.vue b/ui/src/views/network/CreateSharedNetworkForm.vue new file mode 100644 index 00000000000..39d9fc238c2 --- /dev/null +++ b/ui/src/views/network/CreateSharedNetworkForm.vue @@ -0,0 +1,716 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + + + + + diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue index 0fdec7ea3f1..6d15d188430 100644 --- a/ui/src/views/network/VpcTiersTab.vue +++ b/ui/src/views/network/VpcTiersTab.vue @@ -154,7 +154,7 @@ placeholder="Netmask of the tier. For example, with VPC CIDR of 10.0.0.0/16 and network tier CIDR of 10.1.1.0/24, gateway is 10.1.1.1 and netmask is 255.255.255.0" v-decorator="['netmask',{rules: [{ required: true, message: 'Required' }]}]"> - + diff --git a/ui/src/views/storage/CreateVolume.vue b/ui/src/views/storage/CreateVolume.vue index 07b4c04c5f8..531361277f1 100644 --- a/ui/src/views/storage/CreateVolume.vue +++ b/ui/src/views/storage/CreateVolume.vue @@ -150,6 +150,7 @@ export default { }) }).finally(() => { this.loading = false + this.$emit('refresh-data') this.closeModal() }) }) diff --git a/ui/src/views/storage/UploadLocalVolume.vue b/ui/src/views/storage/UploadLocalVolume.vue index a145ca6ef39..1b22789d602 100644 --- a/ui/src/views/storage/UploadLocalVolume.vue +++ b/ui/src/views/storage/UploadLocalVolume.vue @@ -127,7 +127,7 @@ export default { if (json && json.listzonesresponse && json.listzonesresponse.zone) { this.zones = json.listzonesresponse.zone if (this.zones.length > 0) { - this.zoneSelected = this.zone[0].id + this.zoneSelected = this.zones[0].id } } })