projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Bug 2272 - NS instantiation fails in VIMs with microversion with a KeyError ...
[osm/RO.git]
/
RO-plugin
/
osm_ro_plugin
/
vim_dummy.py
diff --git
a/RO-plugin/osm_ro_plugin/vim_dummy.py
b/RO-plugin/osm_ro_plugin/vim_dummy.py
index
c00071f
..
dc0e00e
100644
(file)
--- a/
RO-plugin/osm_ro_plugin/vim_dummy.py
+++ b/
RO-plugin/osm_ro_plugin/vim_dummy.py
@@
-20,12
+20,14
@@
Implements a Dummy vim plugin.
"""
Implements a Dummy vim plugin.
"""
-import yaml
-from osm_ro_plugin import vimconn
-from uuid import uuid4
from copy import deepcopy
import logging
from copy import deepcopy
import logging
-from random import randrange
+from random import SystemRandom
+from uuid import uuid4
+
+from osm_ro_plugin import vimconn
+import yaml
+
__author__ = "Alfonso Tierno"
__date__ = "2020-04-20"
__author__ = "Alfonso Tierno"
__date__ = "2020-04-20"
@@
-158,6
+160,11
@@
class VimDummyConnector(vimconn.VimConnector):
nets.append(net)
nets.append(net)
+ # if no network is returned and search by name create a new one
+ if not nets and filter_dict and filter_dict.get("name"):
+ net_id, net = self.new_network(filter_dict.get("name"), "mgmt")
+ nets.append(net)
+
return nets
def get_network(self, net_id):
return nets
def get_network(self, net_id):
@@
-341,6
+348,7
@@
class VimDummyConnector(vimconn.VimConnector):
start,
image_id,
flavor_id,
start,
image_id,
flavor_id,
+ affinity_group_list,
net_list,
cloud_config=None,
disk_list=None,
net_list,
cloud_config=None,
disk_list=None,
@@
-371,8
+379,10
@@
class VimDummyConnector(vimconn.VimConnector):
if iface.get("type") in ("SR-IOV", "PCI-PASSTHROUGH") and self.config.get(
"sdn-port-mapping"
):
if iface.get("type") in ("SR-IOV", "PCI-PASSTHROUGH") and self.config.get(
"sdn-port-mapping"
):
- compute_index = randrange(len(self.config["sdn-port-mapping"]))
- port_index = randrange(
+ compute_index = SystemRandom().randrange(
+ len(self.config["sdn-port-mapping"])
+ )
+ port_index = SystemRandom().randrange(
len(self.config["sdn-port-mapping"][compute_index]["ports"])
)
interface["compute_node"] = self.config["sdn-port-mapping"][
len(self.config["sdn-port-mapping"][compute_index]["ports"])
)
interface["compute_node"] = self.config["sdn-port-mapping"][
@@
-416,7
+426,7
@@
class VimDummyConnector(vimconn.VimConnector):
return self.vms[vm_id]
return self.vms[vm_id]
- def delete_vminstance(self, vm_id, created_items=None):
+ def delete_vminstance(self, vm_id, created_items=None
, volumes_to_hold=None
):
if vm_id not in self.vms:
raise vimconn.VimConnNotFoundException(
"vm with id {} not found".format(vm_id)
if vm_id not in self.vms:
raise vimconn.VimConnNotFoundException(
"vm with id {} not found".format(vm_id)