Skip to content

Commit f3e0c31

Browse files
author
utchoang
committed
changes logical
1 parent 6b01907 commit f3e0c31

15 files changed

Lines changed: 968 additions & 602 deletions

‎ui/public/locales/en.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@
336336
"label.add.ldap.list.users": "List LDAP users",
337337
"label.add.list.name": "ACL List Name",
338338
"label.add.load.balancer": "Add Load Balancer",
339-
"label.add.logical.network": "Add Network to Logical router",
340339
"label.add.management.ip.range": "Add Management IP Range",
341340
"label.add.more": "Add More",
342341
"label.add.netscaler.device": "Add Netscaler device",
@@ -395,6 +394,7 @@
395394
"label.add.tungsten.policy.set": "Add Application Policy Set",
396395
"label.add.tungsten.router.table": "Add route table to this network",
397396
"label.add.tungsten.service.group": "Add Service Group",
397+
"label.add.tungsten.tag": "Add Tag",
398398
"label.add.tungsten.tag.type": "Add Tag Type",
399399
"label.add.ucs.manager": "Add UCS Manager",
400400
"label.add.user": "Add User",
@@ -2614,7 +2614,7 @@
26142614
"message.action.delete.external.load.balancer": "Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device.",
26152615
"message.action.delete.ingress.rule": "Please confirm that you want to delete this ingress rule.",
26162616
"message.action.delete.instance.group": "Please confirm that you want to delete the instance group",
2617-
"message.action.delete.interface.static.route": "Please confirm that you want to remove this interface Static Route",
2617+
"message.action.delete.interface.static.route": "Please confirm that you want to remove this interface Static Route?",
26182618
"message.action.delete.iso": "Please confirm that you want to delete this ISO.",
26192619
"message.action.delete.iso.for.all.zones": "The ISO is used by all zones. Please confirm that you want to delete it from all zones.",
26202620
"message.action.delete.network": "Please confirm that you want to delete this network.",
@@ -2757,6 +2757,7 @@
27572757
"message.adding.host": "Adding host",
27582758
"message.adding.netscaler.device": "Adding Netscaler device",
27592759
"message.adding.netscaler.provider": "Adding Netscaler provider",
2760+
"message.adding.firewall.policy": "Adding Firewall Policy",
27602761
"message.additional.networks.desc": "Please select additional network(s) that your virtual instance will be connected to.",
27612762
"message.admin.guide.read": "For VMware-based VMs, please read the dynamic scaling section in the admin guide before scaling. Would you like to continue?,",
27622763
"message.advanced.mode.desc": "Choose this network model if you wish to enable VLAN support. This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking.",
@@ -2765,6 +2766,7 @@
27652766
"message.after.enable.s3": "S3-backed Secondary Storage configured. Note: When you leave this page, you will not be able to re-configure S3 again.",
27662767
"message.after.enable.swift": "Swift configured. Note: When you leave this page, you will not be able to re-configure Swift again.",
27672768
"message.alert.state.detected": "Alert state detected",
2769+
"message.adding.tag": "Appling tag",
27682770
"message.allow.vpn.access": "Please enter a username and password of the user that you want to allow VPN access.",
27692771
"message.apply.snapshot.policy": "You have successfully updated your current snapshot policy.",
27702772
"message.apply.success": "Apply Successfully",
@@ -2929,13 +2931,14 @@
29292931
"message.delete.tag.for.networkacl": "Remove tag for NetworkACL",
29302932
"message.delete.tag.processing": "Deleting tag...",
29312933
"message.delete.tungsten.policy.rule": "Please confirm that you want to delete Policy Rule?",
2932-
"message.delete.tungsten.tag": "Are you sure you want to remove this Tag from this Policy",
2934+
"message.delete.tungsten.tag": "Are you sure you want to remove this Tag from this Policy?",
29332935
"message.delete.user": "Please confirm that you would like to delete this user.",
29342936
"message.delete.vpn.connection": "Please confirm that you want to delete VPN connection",
29352937
"message.delete.vpn.customer.gateway": "Please confirm that you want to delete this VPN Customer Gateway",
29362938
"message.delete.vpn.gateway": "Please confirm that you want to delete this VPN Gateway",
29372939
"message.deleting.node": "Deleting Node",
29382940
"message.deleting.vm": "Deleting VM",
2941+
"message.deleting.firewall.policy": "Deleting Firewall Policy",
29392942
"message.deployasis": "Selected template is Deploy As-Is i.e., the VM is deployed by importing an OVA with vApps directly into vCenter. Root disk(s) resize is allowed only on stopped VMs for such templates.",
29402943
"message.desc.add.new.lb.sticky.rule": "Add new LB sticky rule",
29412944
"message.desc.advanced.zone": "This is recommended and allows more sophisticated network topologies. This network model provides the most flexibility in defining guest networks and providing custom network offerings such as firewall, VPN, or load balancer support.",
@@ -3649,5 +3652,7 @@
36493652
"state.suspended": "Suspended",
36503653
"title.upload.volume": "Upload Volume",
36513654
"user.login": "Login",
3652-
"user.logout": "Logout"
3655+
"user.logout": "Logout",
3656+
"label.majorsequence": "Major Sequence",
3657+
"label.minorsequence": "Minor Sequence"
36533658
}

‎ui/src/components/widgets/Breadcrumb.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
<a-breadcrumb class="breadcrumb">
2020
<a-breadcrumb-item v-for="(item, index) in breadList" :key="index">
2121
<router-link
22-
v-if="item && item.name"
22+
v-if="item && item.name && !item.meta.disabledListView"
2323
:to="{ path: item.path === '' ? '/' : item.path }"
2424
>
2525
<a-icon v-if="index == 0" :type="item.meta.icon" style="font-size: 16px" @click="resetToMainView" />
2626
{{ $t(item.meta.title) }}
2727
</router-link>
28+
<span v-else-if="item.meta.disabledListView">{{ $t(item.meta.title) }}</span>
2829
<span v-else-if="$route.params.id">
2930
<label
3031
v-if="'name' in resource &&
@@ -96,6 +97,7 @@ export default {
9697
}
9798
this.breadList.push(item)
9899
})
100+
console.log(this.breadList)
99101
},
100102
resetToMainView () {
101103
this.$store.dispatch('SetProject', {})

‎ui/src/config/router.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ function generateRouterMap (section) {
4848
icon: section.icon,
4949
docHelp: Vue.prototype.$applyDocHelpMappings(section.docHelp),
5050
searchFilters: section.searchFilters,
51-
related: section.related
51+
related: section.related,
52+
disabledListView: section.disabledListView
5253
},
5354
component: RouteView
5455
}
@@ -80,7 +81,8 @@ function generateRouterMap (section) {
8081
searchFilters: child.searchFilters,
8182
related: child.related,
8283
actions: child.actions,
83-
tabs: child.tabs
84+
tabs: child.tabs,
85+
disabledListView: child.disabledListView
8486
},
8587
component: component,
8688
hideChildrenInMenu: true,

‎ui/src/config/section/network.js‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ export default {
718718
title: 'label.tungsten.network.router.table',
719719
icon: tungsten,
720720
hidden: true,
721+
disabledListView: true,
721722
permission: ['listTungstenFabricNetworkRouteTable'],
722723
details: ['uuid', 'name'],
723724
tabs: [
@@ -731,14 +732,6 @@ export default {
731732
}
732733
],
733734
actions: [
734-
{
735-
api: 'addTungstenFabricNetworkStaticRoute',
736-
icon: 'plus',
737-
label: 'label.add.tungsten.network.static.route',
738-
dataView: true,
739-
popup: true,
740-
component: () => import('@/views/network/tungsten/AddTungstenNetworkStaticRoute.vue')
741-
},
742735
{
743736
api: 'removeTungstenFabricNetworkRouteTable',
744737
icon: 'delete',
@@ -753,6 +746,7 @@ export default {
753746
title: 'label.tungsten.interface.router.table',
754747
icon: tungsten,
755748
hidden: true,
749+
disabledListView: true,
756750
permission: ['listTungstenFabricInterfaceRouteTable'],
757751
details: ['uuid', 'name'],
758752
tabs: [
@@ -766,14 +760,6 @@ export default {
766760
}
767761
],
768762
actions: [
769-
{
770-
api: 'addTungstenFabricInterfaceStaticRoute',
771-
icon: 'plus',
772-
label: 'label.add.tungsten.interface.static.route',
773-
dataView: true,
774-
popup: true,
775-
component: () => import('@/views/network/tungsten/AddTungstenInterfaceStaticRoute.vue')
776-
},
777763
{
778764
api: 'removeTungstenFabricInterfaceRouteTable',
779765
icon: 'delete',
@@ -788,6 +774,7 @@ export default {
788774
title: 'label.network.policy',
789775
icon: tungsten,
790776
hidden: true,
777+
disabledListView: true,
791778
permission: ['listTungstenFabricPolicy'],
792779
details: ['name'],
793780
tabs: [
@@ -830,6 +817,41 @@ export default {
830817
}
831818
}
832819
]
820+
},
821+
{
822+
name: 'tungstenpolicyset',
823+
title: 'label.application.policy.set',
824+
icon: tungsten,
825+
hidden: true,
826+
disabledListView: true,
827+
permission: ['listTungstenFabricApplicationPolicySet'],
828+
details: ['name'],
829+
tabs: [
830+
{
831+
name: 'details',
832+
component: () => import('@/components/view/DetailsTab.vue')
833+
},
834+
{
835+
name: 'firewall.policy',
836+
component: () => import('@/views/network/tungsten/TungstenFabricFirewallPolicy.vue')
837+
},
838+
{
839+
name: 'tag',
840+
component: () => import('@/views/network/tungsten/TungstenFabricFirewallTag.vue')
841+
}
842+
],
843+
actions: [
844+
{
845+
api: 'deleteTungstenFabricApplicationPolicySet',
846+
icon: 'delete',
847+
label: 'label.delete.tungsten.policy.set',
848+
message: 'label.confirm.delete.tungsten.policy.set',
849+
dataView: true,
850+
mapping: {
851+
applicationpolicysetuuid: (record) => record.uuid
852+
}
853+
}
854+
]
833855
}
834856
]
835857
}

‎ui/src/views/AutogenView.vue‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,18 @@ export default {
849849
} else if (this.$route.path.startsWith('/ldapsetting/')) {
850850
params.hostname = this.$route.params.id
851851
}
852+
if (this.$route.path.startsWith('/tungstenpolicy/')) {
853+
params.policyuuid = this.$route.params.id
854+
}
855+
if (this.$route.path.startsWith('/tungstenpolicyset/')) {
856+
params.applicationpolicysetuuid = this.$route.params.id
857+
}
858+
if (this.$route.path.startsWith('/tungstennetworkroutertable/')) {
859+
params.tungstennetworkroutetableuuid = this.$route.params.id
860+
}
861+
if (this.$route.path.startsWith('/tungsteninterfaceroutertable/')) {
862+
params.tungsteninterfaceroutetableuuid = this.$route.params.id
863+
}
852864
}
853865
854866
if (this.$store.getters.listAllProjects && !this.projectView) {
@@ -1391,7 +1403,7 @@ export default {
13911403
if (!action.mapping[key].value) {
13921404
continue
13931405
}
1394-
params[key] = action.mapping[key].value(this.resource, params)
1406+
params[key] = action.mapping[key].value(this.resource, params, this.$route.query)
13951407
}
13961408
}
13971409
}

‎ui/src/views/network/tungsten/AddTungstenInterfaceStaticRoute.vue‎

Lines changed: 0 additions & 147 deletions
This file was deleted.

0 commit comments

Comments
 (0)