diff options
author | Parker Berberian <pberberian@iol.unh.edu> | 2019-06-25 16:50:01 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2019-06-25 16:50:01 +0000 |
commit | a035fdf2d23cecf041e77d0ea4ffa58deb8adce8 (patch) | |
tree | b363a944ded85f8ff2fb549b5d90ee97e1cca494 /dashboard/src/dashboard/testing_utils.py | |
parent | 6120aa3d50e645d536a27abd4da1f69c204d7e7a (diff) | |
parent | c03f371b54469b2ae7f01c275045fc199c29d83f (diff) |
Merge "Adds Tests"
Diffstat (limited to 'dashboard/src/dashboard/testing_utils.py')
-rw-r--r-- | dashboard/src/dashboard/testing_utils.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dashboard/src/dashboard/testing_utils.py b/dashboard/src/dashboard/testing_utils.py index 1cca3e6..a96b6d0 100644 --- a/dashboard/src/dashboard/testing_utils.py +++ b/dashboard/src/dashboard/testing_utils.py @@ -80,7 +80,7 @@ def make_booking(owner=None, start=timezone.now(), topology={}, installer=None, scenario=None): grb, host_set = make_grb(topology, owner, lab) - config_bundle = make_config_bundle(grb, owner, topology, host_set, installer, scenario) + config_bundle, opnfv_bundle = make_config_bundle(grb, owner, topology, host_set, installer, scenario) resource = ResourceManager.getInstance().convertResourceBundle(grb, config=config_bundle) if not resource: raise Exception("Resource not created") @@ -93,7 +93,8 @@ def make_booking(owner=None, start=timezone.now(), owner=owner, purpose=purpose, project=project, - lab=lab + lab=lab, + opnfv_config=opnfv_bundle ) @@ -124,7 +125,7 @@ def make_config_bundle(grb, owner, topology={}, host_set={}, host_config=host_config, opnfv_config=opnfv_config ) - return cb + return cb, opnfv_config def make_network(name, lab, grb, public): @@ -230,7 +231,7 @@ def make_vlan_manager(vlans=None, block_size=20, allow_overlapping=False, reserv ) -def make_lab(user=None, name="Test Lab Instance", +def make_lab(user=None, name="Test_Lab_Instance", status=LabStatus.UP, vlan_manager=None, pub_net_count=5): if not vlan_manager: |