projects
/
osm
/
vim-emu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92a37cd
)
Fix: Last fixes for OpenStack API imports after renaming
author
peusterm
<manuel.peuster@uni-paderborn.de>
Wed, 17 May 2017 08:08:50 +0000
(10:08 +0200)
committer
peusterm
<manuel.peuster@uni-paderborn.de>
Wed, 17 May 2017 08:08:50 +0000
(10:08 +0200)
src/emuvim/api/openstack/monitor_api.py
patch
|
blob
|
history
src/emuvim/api/openstack/openstack_dummies/neutron_dummy_api.py
patch
|
blob
|
history
src/emuvim/api/openstack/resources/net.py
patch
|
blob
|
history
diff --git
a/src/emuvim/api/openstack/monitor_api.py
b/src/emuvim/api/openstack/monitor_api.py
index
b27a9fa
..
eb48947
100644
(file)
--- a/
src/emuvim/api/openstack/monitor_api.py
+++ b/
src/emuvim/api/openstack/monitor_api.py
@@
-97,7
+97,7
@@
class MonitorVnf(Resource):
vnf_name = 'mn.' + vnf_name
found = False
vnf_name = 'mn.' + vnf_name
found = False
- from emuvim.api.
heat
.openstack_api_endpoint import OpenstackApiEndpoint
+ from emuvim.api.
openstack
.openstack_api_endpoint import OpenstackApiEndpoint
for api in OpenstackApiEndpoint.dc_apis:
if vnf_name[3:] in api.compute.dc.net:
found = True
for api in OpenstackApiEndpoint.dc_apis:
if vnf_name[3:] in api.compute.dc.net:
found = True
@@
-143,7
+143,7
@@
class MonitorVnfAbs(Resource):
vnf_name = 'mn.' + vnf_name
found = False
vnf_name = 'mn.' + vnf_name
found = False
- from emuvim.api.
heat
.openstack_api_endpoint import OpenstackApiEndpoint
+ from emuvim.api.
openstack
.openstack_api_endpoint import OpenstackApiEndpoint
for api in OpenstackApiEndpoint.dc_apis:
if vnf_name[3:] in api.compute.dc.net:
found = True
for api in OpenstackApiEndpoint.dc_apis:
if vnf_name[3:] in api.compute.dc.net:
found = True
@@
-218,7
+218,7
@@
class MonitorVnfDcStack(Resource):
# Returns a string or a Response object
def _findName(self, dc, stack, vnf):
dc_real = None
# Returns a string or a Response object
def _findName(self, dc, stack, vnf):
dc_real = None
- from emuvim.api.
heat
.openstack_api_endpoint import OpenstackApiEndpoint
+ from emuvim.api.
openstack
.openstack_api_endpoint import OpenstackApiEndpoint
for api in OpenstackApiEndpoint.dc_apis:
# search for datacenters
if dc in api.manage.net.dcs:
for api in OpenstackApiEndpoint.dc_apis:
# search for datacenters
if dc in api.manage.net.dcs:
diff --git
a/src/emuvim/api/openstack/openstack_dummies/neutron_dummy_api.py
b/src/emuvim/api/openstack/openstack_dummies/neutron_dummy_api.py
index
03c01c1
..
38a5ad4
100644
(file)
--- a/
src/emuvim/api/openstack/openstack_dummies/neutron_dummy_api.py
+++ b/
src/emuvim/api/openstack/openstack_dummies/neutron_dummy_api.py
@@
-461,7
+461,7
@@
class NeutronCreateSubnet(Resource):
net.subnet_id = subnet_dict["subnet"]["id"]
else:
net.subnet_id = str(uuid.uuid4())
net.subnet_id = subnet_dict["subnet"]["id"]
else:
net.subnet_id = str(uuid.uuid4())
- import emuvim.api.
heat
.ip_handler as IP
+ import emuvim.api.
openstack
.ip_handler as IP
net.set_cidr(IP.get_new_cidr(net.subnet_id))
if "tenant_id" in subnet_dict["subnet"]:
net.set_cidr(IP.get_new_cidr(net.subnet_id))
if "tenant_id" in subnet_dict["subnet"]:
diff --git
a/src/emuvim/api/openstack/resources/net.py
b/src/emuvim/api/openstack/resources/net.py
index
efb22be
..
8d8a5d3
100644
(file)
--- a/
src/emuvim/api/openstack/resources/net.py
+++ b/
src/emuvim/api/openstack/resources/net.py
@@
-139,7
+139,7
@@
class Net:
"""
if cidr is None:
if self._cidr is not None:
"""
if cidr is None:
if self._cidr is not None:
- import emuvim.api.
heat
.ip_handler as IP
+ import emuvim.api.
openstack
.ip_handler as IP
IP.free_cidr(self._cidr, self.subnet_id)
self._cidr = None
self.reset_issued_ip_addresses()
IP.free_cidr(self._cidr, self.subnet_id)
self._cidr = None
self.reset_issued_ip_addresses()