From f4626bb4d8aaae85d0ba35ec1fb6c33a18dae356 Mon Sep 17 00:00:00 2001 From: Ritchie Vincent Date: Wed, 5 Feb 2020 11:04:07 +0000 Subject: [PATCH] vpc: consolidated tabs for configuration and management (#143) Adds VPC consolidated component that has tabs for may related items. Co-authored-by: Rohit Yadav Signed-off-by: Rohit Yadav --- ui/src/components/view/ResourceView.vue | 7 + ui/src/config/section/network.js | 34 +- ui/src/locales/en.json | 4 + ui/src/views/network/VpcRouterTab.vue | 98 --- ui/src/views/network/VpcTab.vue | 939 ++++++++++++++++++++++++ ui/src/views/network/VpcTiersTab.vue | 42 +- 6 files changed, 980 insertions(+), 144 deletions(-) delete mode 100644 ui/src/views/network/VpcRouterTab.vue create mode 100644 ui/src/views/network/VpcTab.vue diff --git a/ui/src/components/view/ResourceView.vue b/ui/src/components/view/ResourceView.vue index 2dc572e625a..cf2ba07dbba 100644 --- a/ui/src/components/view/ResourceView.vue +++ b/ui/src/components/view/ResourceView.vue @@ -27,7 +27,14 @@ class="spin-content" :bordered="true" style="width:100%"> + import('@/components/view/DetailsTab.vue') - }, { - name: 'Router', - component: () => import('@/views/network/VpcRouterTab.vue') - }, { - name: 'Network', - component: () => import('@/views/network/VpcTiersTab.vue') + name: 'VPC', + component: () => import('@/views/network/VpcTab.vue') }], actions: [ { diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index 6125c4168ff..73c7bc0e745 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -458,8 +458,10 @@ "label.add.l2.guest.network": "Add L2 Guest Network", "label.add.ldap.account": "Add LDAP account", "label.add.ldap.list.users": "List LDAP users", +"label.add.list.name":"ACL List Name", "label.add.netScaler.device": "Add Netscaler device", "label.add.network.offering": "Add network offering", +"label.add.new.gateway": "Add new gateway", "label.add.new.tier": "Add new tier", "label.add.nfs.secondary.staging.store": "Add NFS Secondary Staging Store", "label.add.pod": "Add Pod", @@ -635,6 +637,7 @@ "label.revoke.project.invite": "Revoke invitation", "label.secondary.storage":"Secondary Storage", "label.secondary.storage.vm":"Secondary storage VM", +"label.service.offering":"Service Offering", "label.set.default.NIC": "Set default NIC", "label.shutdown.provider": "Shutdown provider", "label.snapshot.schedule": "Set up Recurring Snapshot", @@ -708,6 +711,7 @@ "memoryusedgb": "Used", "memused": "Memory Usage", "message.edit.account": "Edit (\"-1\" indicates no limit to the amount of resources create)", +"message.add.new.gateway.to.vpc":"Please specify the information to add a new gateway to this VPC.", "message.assign.instance.another": "Please specify the account type, domain, account name and network (optional) of the new account.
If the default nic of the vm is on a shared network, CloudStack will check if the network can be used by the new account if you do not specify one network.
If the default nic of the vm is on a isolated network, and the new account has more one isolated networks, you should specify one.", "message.network.addVM.desc":"Please specify the network that you would like to add this VM to. A new NIC will be added for this network.", "message.network.removeNIC": "Please confirm that want to remove this NIC, which will also remove the associated network from the VM.", diff --git a/ui/src/views/network/VpcRouterTab.vue b/ui/src/views/network/VpcRouterTab.vue deleted file mode 100644 index dde958f2f04..00000000000 --- a/ui/src/views/network/VpcRouterTab.vue +++ /dev/null @@ -1,98 +0,0 @@ -// 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/VpcTab.vue b/ui/src/views/network/VpcTab.vue new file mode 100644 index 00000000000..02da039b100 --- /dev/null +++ b/ui/src/views/network/VpcTab.vue @@ -0,0 +1,939 @@ +// 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 fd30f00768b..a9fd5bbf8d7 100644 --- a/ui/src/views/network/VpcTiersTab.vue +++ b/ui/src/views/network/VpcTiersTab.vue @@ -24,10 +24,36 @@
- {{ network.name }} + {{ $t('name') }} +
+
+ {{ network.name }} + {{ network.broadcasturi }}
-
CIDR: {{ network.cidr }}
+
+
{{ $t('state') }}
+
+
+
+
+ {{ $t('CIDR') }} +
+
{{ network.cidr }}
+
+
+
+ {{ $t('aclid') }} +
+
+ + {{ network.aclid }} + +
+
+ +
+
Internal LB @@ -50,20 +76,8 @@
-
- - - -
-