Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Added support for OSCreds output to SNAPS-OO orchestrator app."
[snaps.git]
/
snaps
/
openstack
/
create_instance.py
diff --git
a/snaps/openstack/create_instance.py
b/snaps/openstack/create_instance.py
index
45666d5
..
16bd0ce
100644
(file)
--- a/
snaps/openstack/create_instance.py
+++ b/
snaps/openstack/create_instance.py
@@
-96,7
+96,7
@@
class OpenStackVmInstance(OpenStackComputeObject):
"""
self.initialize()
"""
self.initialize()
- if len(self.__ports)
== 0
:
+ if len(self.__ports)
!= len(self.instance_settings.port_settings)
:
self.__ports = self.__create_ports(
self.instance_settings.port_settings)
if not self.__vm:
self.__ports = self.__create_ports(
self.instance_settings.port_settings)
if not self.__vm:
@@
-346,12
+346,13
@@
class OpenStackVmInstance(OpenStackComputeObject):
for port_setting in port_settings:
port = neutron_utils.get_port(
for port_setting in port_settings:
port = neutron_utils.get_port(
- self.__neutron, self.__keystone, port_settings=port_setting)
+ self.__neutron, self.__keystone, port_settings=port_setting,
+ project_name=self._os_creds.project_name)
if not port:
port = neutron_utils.create_port(
self.__neutron, self._os_creds, port_setting)
if not port:
port = neutron_utils.create_port(
self.__neutron, self._os_creds, port_setting)
-
if port:
-
ports.append((port_setting.name, port))
+ if port:
+ ports.append((port_setting.name, port))
return ports
return ports
@@
-390,8
+391,10
@@
class OpenStackVmInstance(OpenStackComputeObject):
port = self.get_port_by_name(port_name)
if port:
if subnet_name:
port = self.get_port_by_name(port_name)
if port:
if subnet_name:
+ network = neutron_utils.get_network_by_id(
+ self.__neutron, port.network_id)
subnet = neutron_utils.get_subnet(
subnet = neutron_utils.get_subnet(
- self.__neutron, subnet_name=subnet_name)
+ self.__neutron,
network,
subnet_name=subnet_name)
if not subnet:
logger.warning('Cannot retrieve port IP as subnet could '
'not be located with name - %s',
if not subnet:
logger.warning('Cannot retrieve port IP as subnet could '
'not be located with name - %s',