X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwlaunchpad%2Ftest%2Fpytest%2Flp_tg_2vrouter_ts_test.py;fp=rwlaunchpad%2Ftest%2Fpytest%2Flp_tg_2vrouter_ts_test.py;h=f22c88fff608ef1680b7471ad21123e4d94d7040;hb=4870d0ee29789b859931e4e2c73e13dcb29537d5;hp=ed00a258740636586a743d991029d95a1cd73d0b;hpb=6f1a3fe149e4a6b9803382cb299c902f4cf58ec9;p=osm%2FSO.git diff --git a/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py b/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py index ed00a258..f22c88ff 100644 --- a/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py +++ b/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """ # -# Copyright 2016 RIFT.IO Inc +# Copyright 2016-2017 RIFT.IO Inc # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -35,16 +35,26 @@ import uuid import gi gi.require_version('RwIwpYang', '1.0') gi.require_version('RwNsrYang', '1.0') -gi.require_version('RwVnfdYang', '1.0') +gi.require_version('RwProjectVnfdYang', '1.0') gi.require_version('RwCloudYang', '1.0') gi.require_version('RwBaseYang', '1.0') gi.require_version('RwResourceMgrYang', '1.0') gi.require_version('RwConmanYang', '1.0') gi.require_version('RwNsmYang', '1.0') - - -from gi.repository import RwIwpYang, NsdYang, NsrYang, RwNsrYang, VldYang, RwVnfdYang, RwCloudYang, RwBaseYang, RwResourceMgrYang, RwConmanYang, RwNsmYang +from gi.repository import ( + RwIwpYang, + ProjectNsdYang as NsdYang, + NsrYang, + RwNsrYang, + VldYang, + RwProjectVnfdYang as RwVnfdYang, + RwCloudYang, + RwBaseYang, + RwResourceMgrYang, + RwConmanYang, + RwNsmYang + ) logging.basicConfig(level=logging.DEBUG) @@ -172,7 +182,7 @@ def tg_2vrouter_ts_nsd_package_file(): def create_nsr_from_nsd_id(nsd_id): - nsr = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr() + nsr = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr() nsr.id = str(uuid.uuid4()) nsr.name = "TG-2Vrouter-TS EPA" nsr.short_name = "TG-2Vrouter-TS EPA" @@ -201,14 +211,14 @@ class DescriptorOnboardError(Exception): pass -def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1"): +def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1", project="default"): logger.info("Waiting for onboard trans_id %s to complete", transaction_id) start_time = time.time() while (time.time() - start_time) < timeout_secs: r = requests.get( - 'http://{host}:4567/api/upload/{t_id}/state'.format( - host=host, t_id=transaction_id + 'http://{host}:8008/api/operational/project/{proj}/create-jobs/job/{t_id}'.format( + host=host, proj=project, t_id=transaction_id ) ) state = r.json() @@ -240,10 +250,10 @@ class TestLaunchpadStartStop(object): cloud_account.openstack.tenant = 'demo' cloud_account.openstack.mgmt_network = 'private' - cloud_proxy.merge_config("/rw-cloud:cloud-account", cloud_account) + cloud_proxy.merge_config("/rw-project:project/rw-cloud:cloud-account", cloud_account) def test_configure_pools(self, resource_mgr_proxy): - pools = RwResourceMgrYang.ResourcePools.from_dict({ + pools = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools.from_dict({ "pools": [{ "name": "vm_pool_a", "resource_type": "compute", "pool_type" : "dynamic"}, @@ -251,29 +261,14 @@ class TestLaunchpadStartStop(object): "resource_type": "network", "pool_type" : "dynamic",}]}) - resource_mgr_proxy.merge_config('/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools) - - def test_configure_resource_orchestrator(self, so_proxy): - cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1', - 'ro_port' : 2022, - 'ro_username' : 'admin', - 'ro_password' : 'admin'}) - so_proxy.merge_config('/rw-conman:cm-config', cfg) - - def test_configure_service_orchestrator(self, nsm_proxy): - cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1', - 'cm_port' : 2022, - 'cm_username' : 'admin', - 'cm_password' : 'admin'}) - nsm_proxy.merge_config('/rw-nsm:ro-config/rw-nsm:cm-endpoint', cfg) + resource_mgr_proxy.merge_config('/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools) - def test_onboard_tg_vnfd(self, logger, vnfd_proxy, tg_vnfd_package_file): logger.info("Onboarding trafgen_vnfd package: %s", tg_vnfd_package_file) trans_id = upload_descriptor(logger, tg_vnfd_package_file) wait_unboard_transaction_finished(logger, trans_id) - catalog = vnfd_proxy.get_config('/vnfd-catalog') + catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog') vnfds = catalog.vnfd assert len(vnfds) == 1, "There should be one vnfds" assert "trafgen_vnfd" in [vnfds[0].name] @@ -283,7 +278,7 @@ class TestLaunchpadStartStop(object): trans_id = upload_descriptor(logger, vrouter_vnfd_package_file) wait_unboard_transaction_finished(logger, trans_id) - catalog = vnfd_proxy.get_config('/vnfd-catalog') + catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog') vnfds = catalog.vnfd assert len(vnfds) == 2, "There should be two vnfds" assert "vrouter_vnfd" in [vnfds[0].name, vnfds[1].name] @@ -293,7 +288,7 @@ class TestLaunchpadStartStop(object): trans_id = upload_descriptor(logger, ts_vnfd_package_file) wait_unboard_transaction_finished(logger, trans_id) - catalog = vnfd_proxy.get_config('/vnfd-catalog') + catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog') vnfds = catalog.vnfd assert len(vnfds) == 3, "There should be three vnfds" assert "trafsink_vnfd" in [vnfds[0].name, vnfds[1].name, vnfds[2].name] @@ -303,7 +298,7 @@ class TestLaunchpadStartStop(object): trans_id = upload_descriptor(logger, tg_2vrouter_ts_nsd_package_file) wait_unboard_transaction_finished(logger, trans_id) - catalog = nsd_proxy.get_config('/nsd-catalog') + catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog') nsds = catalog.nsd assert len(nsds) == 1, "There should only be a single nsd" nsd = nsds[0] @@ -311,13 +306,13 @@ class TestLaunchpadStartStop(object): assert nsd.short_name == "tg_2vrouter_ts_nsd" def test_instantiate_tg_2vrouter_ts_nsr(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy): - catalog = nsd_proxy.get_config('/nsd-catalog') + catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog') nsd = catalog.nsd[0] nsr = create_nsr_from_nsd_id(nsd.id) - nsr_proxy.merge_config('/ns-instance-config', nsr) + nsr_proxy.merge_config('/rw-project:project[rw-project:name="default"]/ns-instance-config', nsr) - nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata') + nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata') nsrs = nsr_opdata.nsr assert len(nsrs) == 1 assert nsrs[0].ns_instance_config_ref == nsr.id