diff options
Diffstat (limited to 'vio/vio/pub')
-rw-r--r-- | vio/vio/pub/msapi/extsys.py | 2 | ||||
-rw-r--r-- | vio/vio/pub/vim/vimapi/network/OperateNetwork.py | 18 | ||||
-rw-r--r-- | vio/vio/pub/vim/vimapi/network/OperatePort.py | 18 | ||||
-rw-r--r-- | vio/vio/pub/vim/vimapi/network/OperateSubnet.py | 12 |
4 files changed, 41 insertions, 9 deletions
diff --git a/vio/vio/pub/msapi/extsys.py b/vio/vio/pub/msapi/extsys.py index 05213f4..9b45f2b 100644 --- a/vio/vio/pub/msapi/extsys.py +++ b/vio/vio/pub/msapi/extsys.py @@ -31,6 +31,8 @@ def get_vim_by_id(vim_id): ret['type'] = ret['cloud-type'] ret['version'] = ret['cloud-region-version'] ret['vimId'] = vim_id + ret['cloud_owner'] = cloud_owner + ret['cloud_region_id'] = cloud_region ret['name'] = vim_id ret['userName'] = ret['esr-system-info-list'][ 'esr-system-info'][0]['user-name'] diff --git a/vio/vio/pub/vim/vimapi/network/OperateNetwork.py b/vio/vio/pub/vim/vimapi/network/OperateNetwork.py index f20e377..91d333f 100644 --- a/vio/vio/pub/vim/vimapi/network/OperateNetwork.py +++ b/vio/vio/pub/vim/vimapi/network/OperateNetwork.py @@ -90,7 +90,11 @@ class OperateNetwork(BaseNet): network = self.auth(vim_info, tenantid) body = translate(self.keys_mapping, body) net = network.network_create(**body) - vim_dict = {"vimName": vim_info['name'], "vimId": vim_info['vimId']} + vim_dict = { + "vimName": vim_info['name'], + "vimId": vim_info['vimId'], + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} resp = self._convert(net) resp.update(vim_dict) return resp @@ -101,7 +105,11 @@ class OperateNetwork(BaseNet): net = network.network_get(networkid) if net is None: return net - vim_dict = {"vimName": vim_info['name'], "vimId": vim_info['vimId']} + vim_dict = { + "vimName": vim_info['name'], + "vimId": vim_info['vimId'], + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} resp = self._convert(net) resp.update(vim_dict) return resp @@ -115,7 +123,11 @@ class OperateNetwork(BaseNet): vim_info = self.get_vim_info(vimid) network = self.auth(vim_info, tenantid) resp = network.networks_get(**query) - vim_dict = {"vimName": vim_info['name'], "vimId": vim_info['vimId']} + vim_dict = { + "vimName": vim_info['name'], + "vimId": vim_info['vimId'], + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} networks = {'networks': []} if resp: for net in resp: diff --git a/vio/vio/pub/vim/vimapi/network/OperatePort.py b/vio/vio/pub/vim/vimapi/network/OperatePort.py index b9abb60..fdf9576 100644 --- a/vio/vio/pub/vim/vimapi/network/OperatePort.py +++ b/vio/vio/pub/vim/vimapi/network/OperatePort.py @@ -68,7 +68,11 @@ class OperatePort(BaseNet): else: body['fixed_ips'] = [{'subnet_id': body.pop('subnetId')}] port = network.port_create(**body) - vim_dict = {"vimName": vim_info['name'], "vimId": vim_info['vimId']} + vim_dict = { + "vimName": vim_info['name'], + "vimId": vim_info['vimId'], + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} resp = self._convert(port) resp.update(vim_dict) return resp @@ -79,7 +83,11 @@ class OperatePort(BaseNet): port = network.port_find(portid, ignore_missing=ignore_missing) if port is None: return port - vim_dict = {"vimName": vim_info['name'], "vimId": vim_info['vimId']} + vim_dict = { + "vimName": vim_info['name'], + "vimId": vim_info['vimId'], + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} resp = self._convert(port) resp.update(vim_dict) return resp @@ -94,7 +102,11 @@ class OperatePort(BaseNet): network = self.auth(vim_info, tenantid) query.update({"project_id": tenantid}) resp = network.ports_get(**query) - vim_dict = {"vimName": vim_info['name'], "vimId": vim_info['vimId']} + vim_dict = { + "vimName": vim_info['name'], + "vimId": vim_info['vimId'], + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} ports = {'ports': []} if resp: for port in resp: diff --git a/vio/vio/pub/vim/vimapi/network/OperateSubnet.py b/vio/vio/pub/vim/vimapi/network/OperateSubnet.py index 1076f40..bd67578 100644 --- a/vio/vio/pub/vim/vimapi/network/OperateSubnet.py +++ b/vio/vio/pub/vim/vimapi/network/OperateSubnet.py @@ -56,7 +56,9 @@ class OperateSubnet(BaseNet): subnet = network.subnet_create(**body) vim_dict = { "vimName": vim_info['name'], "vimId": vim_info['vimId'], - "tenantId": tenantid} + "tenantId": tenantid, + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} resp = self._convert(subnet) resp.update(vim_dict) return resp @@ -69,7 +71,9 @@ class OperateSubnet(BaseNet): return subnet vim_dict = { "vimName": vim_info['name'], "vimId": vim_info['vimId'], - "tenantId": tenantid} + "tenantId": tenantid, + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} resp = self._convert(subnet) resp.update(vim_dict) return resp @@ -86,7 +90,9 @@ class OperateSubnet(BaseNet): resp = network.subnets_get(**query) vim_dict = { "vimName": vim_info['name'], "vimId": vim_info['vimId'], - "tenantId": tenantid} + "tenantId": tenantid, + 'cloud_owner': vim_info.get('cloud_owner'), + 'cloud_region_id': vim_info.get("cloud_region_id")} subnets = {'subnets': []} if resp: for subnet in resp: |