projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes 191 preserve VDU interface order at all VNFD schemas
[osm/RO.git]
/
vimconn_openstack.py
diff --git
a/vimconn_openstack.py
b/vimconn_openstack.py
index
61d4b43
..
e94b96d
100644
(file)
--- a/
vimconn_openstack.py
+++ b/
vimconn_openstack.py
@@
-34,6
+34,7
@@
import logging
import netaddr
import time
import yaml
import netaddr
import time
import yaml
+import random
from novaclient import client as nClient_v2, exceptions as nvExceptions, api_versions as APIVersion
import keystoneclient.v2_0.client as ksClient_v2
from novaclient import client as nClient_v2, exceptions as nvExceptions, api_versions as APIVersion
import keystoneclient.v2_0.client as ksClient_v2
@@
-305,8
+306,9
@@
class vimconnector(vimconn.vimconnector):
if not ip_profile:
ip_profile = {}
if 'subnet_address' not in ip_profile:
if not ip_profile:
ip_profile = {}
if 'subnet_address' not in ip_profile:
- #Fake subnet is required
- ip_profile['subnet_address'] = "192.168.111.0/24"
+ #Fake subnet is required
+ subnet_rand = random.randint(0, 255)
+ ip_profile['subnet_address'] = "192.168.{}.0/24".format(subnet_rand)
if 'ip_version' not in ip_profile:
ip_profile['ip_version'] = "IPv4"
subnet={"name":net_name+"-subnet",
if 'ip_version' not in ip_profile:
ip_profile['ip_version'] = "IPv4"
subnet={"name":net_name+"-subnet",
@@
-684,7
+686,7
@@
class vimconnector(vimconn.vimconnector):
#TODO ip, security groups
Returns the instance identifier
'''
#TODO ip, security groups
Returns the instance identifier
'''
- self.logger.debug("
Creating VM image '%s' flavor
'%s' nics='%s'",image_id, flavor_id,str(net_list))
+ self.logger.debug("
new_vminstance input: image='%s' flavor=
'%s' nics='%s'",image_id, flavor_id,str(net_list))
try:
metadata={}
net_list_vim=[]
try:
metadata={}
net_list_vim=[]