Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/components/view/ResourceView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,14 @@
class="spin-content"
:bordered="true"
style="width:100%">
<component
v-if="tabs.length === 1"
:is="tabs[0].component"
:resource="resource"
:loading="loading"
:tab="tabs[0].name" />
<a-tabs
v-else
style="width: 100%"
:animated="false"
:defaultActiveKey="tabs[0].name"
Expand Down
34 changes: 2 additions & 32 deletions src/config/section/network.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,43 +119,13 @@ export default {
columns: ['name', 'state', 'displaytext', 'cidr', 'account', 'zonename'],
details: ['name', 'id', 'displaytext', 'cidr', 'networkdomain', 'ispersistent', 'redundantvpcrouter', 'restartrequired', 'zonename', 'account', 'domain'],
related: [{
name: 'privategw',
title: 'Private Gateways',
param: 'vpcid'
}, {
name: 'publicip',
title: 'Public IP Addresses',
param: 'vpcid'
}, {
name: 's2svpn',
title: 'Site-to-Site VPN Gateways',
param: 'vpcid'
}, {
name: 's2svpnconn',
title: 'Site-to-Site VPN Connections',
param: 'vpcid'
}, {
name: 'acllist',
title: 'Network ACL Lists',
param: 'vpcid'
}, {
name: 'guestnetwork',
title: 'Networks',
param: 'vpcid'
}, {
name: 'vm',
title: 'Instances',
param: 'vpcid'
}],
tabs: [{
name: 'details',
component: () => 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: [
{
Expand Down
4 changes: 4 additions & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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. <br> 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. <br> 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.",
Expand Down
98 changes: 0 additions & 98 deletions src/views/network/VpcRouterTab.vue

This file was deleted.

Loading