Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
03a172c
add tungsten fabric
Oct 7, 2021
64f41ab
revert deleted file
Oct 14, 2021
1692c48
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Nov 16, 2021
57f2fcc
Merge branch 'main' into feature/ui-tungsten-intergation
Jan 19, 2022
6b01907
Merge branch 'main' into feature/ui-tungsten-intergation
Feb 15, 2022
f3e0c31
changes logical
Feb 17, 2022
ea2755a
Merge branch 'main' into feature/ui-tungsten-intergation
Feb 25, 2022
36bf0b6
add tungsten network routing policy
Feb 25, 2022
d62d102
fixes add routing policy
Feb 28, 2022
8462049
fixes
Mar 7, 2022
13f1128
fixes
Mar 7, 2022
5699072
add tungsten network service provider & hidden tabs
Mar 8, 2022
09374ac
fixes router link of tungsten
Mar 8, 2022
64730f6
fixes undefined table
Mar 8, 2022
3fa9a42
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 11, 2022
0bcf1ff
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 11, 2022
21d3e9b
fixes
Mar 11, 2022
c853532
fixes
Mar 11, 2022
26f3fe7
add default value
Mar 11, 2022
9daf037
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 14, 2022
dc96e25
fixes style, errors
Mar 14, 2022
e5bc3dd
fixes vue3 error
Mar 14, 2022
5836696
fixes
Mar 14, 2022
1d05776
fixes add routing policy
Mar 14, 2022
2c3acfd
fixes add routing policy term
Mar 14, 2022
44e96d1
fixes action detail
Mar 15, 2022
b71d212
fixes function name
Mar 15, 2022
f3a0ca0
fixes create tungsten zone
Mar 16, 2022
7fa296f
rename function
Mar 16, 2022
4d905df
fixes
Mar 16, 2022
96a6ac7
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 16, 2022
7a8cfcd
format en.json
Mar 16, 2022
7e87895
fixes
Mar 16, 2022
156a5f0
fixes
Mar 16, 2022
ed30889
fixes network routing policy
Mar 16, 2022
1abf264
translate message
Mar 16, 2022
a913d82
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Mar 23, 2022
267b795
Merge branch 'main-upstream' into feature/ui-tungsten-intergation
Sep 15, 2022
d8d86af
fix conflit
Sep 16, 2022
2eddd7a
Merge branch 'main' into feature/ui-tungsten-intergation
Oct 6, 2022
96db9f3
update custom columns
Oct 7, 2022
16b0002
remove Tungsten Fabric Routing tab
Oct 7, 2022
51f5f45
Merge branch 'main' into pr/5579
nvazquez Feb 3, 2023
05e1b3e
Fix double columns
davidjumani Feb 6, 2023
1524aec
Tungsten: set host params when agent connects
weizhouapache Feb 6, 2023
493d0cb
kill a rat
DaanHoogland Feb 6, 2023
5750075
Update engine/api/src/main/java/org/apache/cloudstack/engine/orchestr…
weizhouapache Feb 7, 2023
b1ad559
Tungsten: chmod +x scripts/vm/network/tungsten/*.sh
weizhouapache Feb 6, 2023
ec6cef8
Tungsten: do not create tap device if the nic is on linux bridge
weizhouapache Feb 9, 2023
458ea20
Merge branch 'main' into pr/5579
DaanHoogland Feb 9, 2023
dbb14dc
Merge branch 'pr/7173' into pr/5579
DaanHoogland Feb 9, 2023
aa52ab2
Revert unnecessary changes
davidjumani Feb 9, 2023
9d36fc2
More ui fixes
davidjumani Feb 9, 2023
fcbbdfb
Revert "Revert unnecessary changes"
davidjumani Feb 9, 2023
f583b6f
Even more fixes
davidjumani Feb 9, 2023
42c8350
Even more fixes v2
davidjumani Feb 9, 2023
e4c41c1
show healtcheck in lb tab only if tf network
davidjumani Feb 9, 2023
07d7c8c
Removing unused files / api links
davidjumani Feb 9, 2023
8939284
Merge branch 'pr/5579' into playtika-tungsten
davidjumani Feb 9, 2023
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
Prev Previous commit
Next Next commit
add tungsten network service provider & hidden tabs
  • Loading branch information
utchoang committed Mar 8, 2022
commit 569907299f08f1956f6dfb7e13f380f39b18696c
221 changes: 113 additions & 108 deletions ui/public/locales/en.json

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions ui/src/components/view/ListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ $t(text.toLowerCase()) }}</router-link>
<router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
</span>
<span v-else-if="isTungstenPath()">
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ $t(text.toLowerCase()) }}</router-link>
<router-link :to="{ path: $route.path, query: { zoneid: $route.query.zoneid } }" v-else>{{ $t(text.toLowerCase()) }}</router-link>
</span>
<span v-else>
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id && $route.path !== '/ssh'">{{ text }}</router-link>
<router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ text }}</router-link>
Expand Down Expand Up @@ -471,6 +475,10 @@ export default {
}
},
methods: {
isTungstenPath () {
return ['/tungstennetworkroutertable', '/tungstenpolicy', '/tungsteninterfaceroutertable',
'/tungstenpolicyset', '/tungstenroutingpolicy', '/firewallrule'].includes(this.$route.path)
},
quickViewEnabled () {
return new RegExp(['/vm', '/kubernetes', '/ssh', '/vmgroup', '/affinitygroup',
'/volume', '/snapshot', '/vmsnapshot', '/backup',
Expand Down
13 changes: 10 additions & 3 deletions ui/src/components/widgets/Breadcrumb.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@
<a-breadcrumb class="breadcrumb">
<a-breadcrumb-item v-for="(item, index) in breadList" :key="index">
<router-link
v-if="item && item.name && !item.meta.disabledListView"
v-if="item && item.name && !tungstenPaths.includes(item.path)"
:to="{ path: item.path === '' ? '/' : item.path }"
>
<a-icon v-if="index == 0" :type="item.meta.icon" style="font-size: 16px" @click="resetToMainView" />
{{ $t(item.meta.title) }}
</router-link>
<span v-else-if="item.meta.disabledListView">{{ $t(item.meta.title) }}</span>
<router-link
v-else-if="tungstenPaths.includes(item.path)"
:to="{ path: item.path === '' ? '/' : item.path, query: { zoneid: $route.query.zoneid } }">
<a-icon v-if="index == 0" :type="item.meta.icon" style="font-size: 16px" @click="resetToMainView" />
{{ $t(item.meta.title) }}
</router-link>
<span v-else-if="$route.params.id">
<label
v-if="'name' in resource &&
Expand Down Expand Up @@ -76,7 +81,9 @@ export default {
data () {
return {
name: '',
breadList: []
breadList: [],
tungstenPaths: ['/tungstennetworkroutertable', '/tungstenpolicy', '/tungsteninterfaceroutertable',
'/tungstenpolicyset', '/tungstenroutingpolicy', '/firewallrule']
}
},
created () {
Expand Down
6 changes: 2 additions & 4 deletions ui/src/config/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ function generateRouterMap (section) {
icon: section.icon,
docHelp: Vue.prototype.$applyDocHelpMappings(section.docHelp),
searchFilters: section.searchFilters,
related: section.related,
disabledListView: section.disabledListView
related: section.related
},
component: RouteView
}
Expand Down Expand Up @@ -81,8 +80,7 @@ function generateRouterMap (section) {
searchFilters: child.searchFilters,
related: child.related,
actions: child.actions,
tabs: child.tabs,
disabledListView: child.disabledListView
tabs: child.tabs
},
component: component,
hideChildrenInMenu: true,
Expand Down
18 changes: 9 additions & 9 deletions ui/src/config/section/network.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ export default {
}, {
name: 'tungsten.router.table',
component: () => import('@/views/network/tungsten/NetworkRouterTableTab.vue'),
show: (record) => { return 'listTungstenFabricNetworkRouteTable' in store.getters.apis }
show: (record) => { return 'listTungstenFabricNetworkRouteTable' in store.getters.apis && record.broadcastdomaintype === 'Tungsten' }
}, {
name: 'tungsten.routing.polices',
component: () => import('@/views/network/tungsten/NetworkRoutingPolicyTab.vue'),
show: (record) => { return 'listTungstenFabricRoutingPolicy' in store.getters.apis }
show: (record) => { return 'listTungstenFabricRoutingPolicy' in store.getters.apis && record.broadcastdomaintype === 'Tungsten' }
}, {
name: 'tungsten.logical.router',
component: () => import('@/views/network/tungsten/LogicalRouterTab.vue'),
show: (record) => { return 'listTungstenFabricLogicalRouter' in store.getters.apis }
show: (record) => { return 'listTungstenFabricLogicalRouter' in store.getters.apis && record.broadcastdomaintype === 'Tungsten' }
}, {
name: 'comments',
component: () => import('@/components/view/AnnotationsTab.vue')
Expand Down Expand Up @@ -726,8 +726,8 @@ export default {
title: 'label.tungsten.network.router.table',
icon: tungsten,
hidden: true,
disabledListView: true,
permission: ['listTungstenFabricNetworkRouteTable'],
columns: ['name'],
details: ['uuid', 'name'],
tabs: [
{
Expand All @@ -754,8 +754,8 @@ export default {
title: 'label.tungsten.interface.router.table',
icon: tungsten,
hidden: true,
disabledListView: true,
permission: ['listTungstenFabricInterfaceRouteTable'],
columns: ['name'],
details: ['uuid', 'name'],
tabs: [
{
Expand All @@ -782,8 +782,8 @@ export default {
title: 'label.network.policy',
icon: tungsten,
hidden: true,
disabledListView: true,
permission: ['listTungstenFabricPolicy'],
columns: ['name'],
details: ['name'],
tabs: [
{
Expand Down Expand Up @@ -831,8 +831,8 @@ export default {
title: 'label.application.policy.set',
icon: tungsten,
hidden: true,
disabledListView: true,
permission: ['listTungstenFabricApplicationPolicySet'],
columns: ['name'],
details: ['name'],
tabs: [
{
Expand Down Expand Up @@ -866,8 +866,8 @@ export default {
title: 'label.routing.policy',
icon: tungsten,
hidden: true,
disabledListView: true,
permission: ['listTungstenFabricRoutingPolicy'],
columns: ['name'],
details: ['uuid', 'name'],
tabs: [
{
Expand All @@ -885,8 +885,8 @@ export default {
title: 'label.routing.policy',
icon: tungsten,
hidden: true,
disabledListView: true,
permission: ['listTungstenFabricFirewallPolicy'],
columns: ['name'],
details: ['uuid', 'name'],
tabs: [
{
Expand Down
1 change: 1 addition & 0 deletions ui/src/views/compute/InstanceTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,7 @@ export default {
created () {
this.vm = this.resource
this.fetchData()
console.log(this.resource)
},
watch: {
resource: function (newItem, oldItem) {
Expand Down
16 changes: 16 additions & 0 deletions ui/src/views/infra/network/ServiceProvidersTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,22 @@ export default {
columns: ['name', 'state', 'hostname', 'zonename']
}
]
},
{
title: 'Tungsten',
details: ['name', 'state', 'id', 'physicalnetworkid', 'servicelist'],
lists: [
{
title: 'label.tungsten.fabric.provider',
api: 'listTungstenFabricProviders',
mapping: {
zoneid: {
value: (record) => { return record.zoneid }
}
},
columns: ['name', 'tungstenproviderhostname', 'tungstenproviderport', 'tungstengateway', 'tungstenprovidervrouterport', 'tungstenproviderintrospectport']
}
]
}
]
}
Expand Down
4 changes: 3 additions & 1 deletion ui/src/views/infra/network/providers/ProviderItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,12 @@ export default {
return
}

console.log(123)

const params = {}
if (args.mapping) {
Object.keys(args.mapping).map(key => {
params[key] = 'value' in args.mapping[key]?.value(this.resource) || null
params[key] = args.mapping[key]?.value(this.resource) || null
})
}
params.page = this.page
Expand Down
11 changes: 10 additions & 1 deletion ui/src/views/network/tungsten/RoutingPolicyTerms.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,16 @@
</a-select>
</template>
<template slot="termvalue" slot-scope="text, record, index">
<a-input :value="text" @change="e => onCellChange(index, 'termvalue', e.target.value)" />
<a-input
v-if="prefixList[index].termtype !== 'action'"
:value="text"
@change="e => onCellChange(index, 'termvalue', e.target.value)" />
<a-select v-else value="default" @change="value => onCellChange(index, 'termvalue', value)">
<a-select-option value="default">default</a-select-option>
<a-select-option value="accept">accept</a-select-option>
<a-select-option value="reject">reject</a-select-option>
<a-select-option value="next">next</a-select-option>
</a-select>
</template>
<template slot="action" slot-scope="text, record, index">
<tooltip-button
Expand Down