This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new baf0cd8 src: ilbvms support
baf0cd8 is described below
commit baf0cd8b090b70d2e136af30277e01d1eb70cbc1
Author: Rohit Yadav <[email protected]>
AuthorDate: Sat Feb 8 19:36:16 2020 +0530
src: ilbvms support
Signed-off-by: Rohit Yadav <[email protected]>
---
src/config/section/infra.js | 2 ++
src/config/section/infra/ilbvms.js | 42 ++++++++++++++++++++++++++++++++++++++
src/config/section/network.js | 16 +++++++++++++++
src/views/infra/InfraSummary.vue | 2 +-
4 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/src/config/section/infra.js b/src/config/section/infra.js
index c42cdf6..dc09f68 100644
--- a/src/config/section/infra.js
+++ b/src/config/section/infra.js
@@ -25,6 +25,7 @@ import primaryStorages from
'@/config/section/infra/primaryStorages'
import secondaryStorages from '@/config/section/infra/secondaryStorages'
import systemVms from '@/config/section/infra/systemVms'
import routers from '@/config/section/infra/routers'
+import ilbvms from '@/config/section/infra/ilbvms'
export default {
name: 'infra',
@@ -49,6 +50,7 @@ export default {
secondaryStorages,
systemVms,
routers,
+ ilbvms,
{
name: 'cpusocket',
title: 'CPU Sockets',
diff --git a/src/config/section/infra/ilbvms.js
b/src/config/section/infra/ilbvms.js
new file mode 100644
index 0000000..c412ac6
--- /dev/null
+++ b/src/config/section/infra/ilbvms.js
@@ -0,0 +1,42 @@
+// 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.
+
+export default {
+ name: 'ilbvm',
+ title: 'Internal LB VMs',
+ icon: 'share-alt',
+ permission: ['listInternalLoadBalancerVMs'],
+ columns: ['name', 'state', 'publicip', 'guestnetworkname', 'vpcname',
'version', 'hostname', 'account', 'zonename', 'requiresupgrade'],
+ details: ['name', 'id', 'version', 'requiresupgrade', 'guestnetworkname',
'vpcname', 'publicip', 'guestipaddress', 'linklocalip', 'serviceofferingname',
'networkdomain', 'isredundantrouter', 'redundantstate', 'hostname', 'account',
'zonename', 'created'],
+ actions: [
+ {
+ api: 'startInternalLoadBalancerVM',
+ icon: 'caret-right',
+ label: 'label.action.start.router',
+ dataView: true,
+ show: (record) => { return record.state === 'Stopped' }
+ },
+ {
+ api: 'stopInternalLoadBalancerVM',
+ icon: 'stop',
+ label: 'label.action.stop.router',
+ dataView: true,
+ args: ['forced'],
+ show: (record) => { return record.state === 'Running' }
+ }
+ ]
+}
diff --git a/src/config/section/network.js b/src/config/section/network.js
index c3f7ab8..bd12508 100644
--- a/src/config/section/network.js
+++ b/src/config/section/network.js
@@ -122,6 +122,14 @@ export default {
name: 'vm',
title: 'Instances',
param: 'vpcid'
+ }, {
+ name: 'router',
+ title: 'Virtual Routers',
+ param: 'vpcid'
+ }, {
+ name: 'ilbvm',
+ title: 'Internal LB VMs',
+ param: 'vpcid'
}],
tabs: [{
name: 'VPC',
@@ -433,6 +441,14 @@ export default {
},
scheme: {
value: (record) => { return 'Internal' }
+ },
+ networkid: {
+ api: 'listNetworks',
+ params: (record) => { return { forvpc: true } }
+ },
+ sourceipaddressnetworkid: {
+ api: 'listNetworks',
+ params: (record) => { return { forvpc: true } }
}
}
},
diff --git a/src/views/infra/InfraSummary.vue b/src/views/infra/InfraSummary.vue
index b7baf9d..d406b32 100644
--- a/src/views/infra/InfraSummary.vue
+++ b/src/views/infra/InfraSummary.vue
@@ -174,7 +174,7 @@ export default {
return {
loading: true,
routes: {},
- sections: ['zones', 'pods', 'clusters', 'hosts', 'storagepools',
'imagestores', 'systemvms', 'routers', 'cpusockets', 'managementservers',
'alerts'],
+ sections: ['zones', 'pods', 'clusters', 'hosts', 'storagepools',
'imagestores', 'systemvms', 'routers', 'cpusockets', 'managementservers',
'alerts', 'ilbvms'],
sslFormVisible: false,
stats: {},
intermediateCertificates: [],