X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwcal%2Ftest%2Ftest_rwcal_openstack.py;h=c2f54c212720fdd9d7d46bd0c1d969b08791b646;hb=f314b4af9744068a7ed7a6a6314220c3aa857523;hp=6b0a24723c1ce26f144b52145e83bc153e46e35a;hpb=df4e972f5e6581a85dd5a072ac4da8585b4c83e6;p=osm%2FSO.git diff --git a/rwcal/test/test_rwcal_openstack.py b/rwcal/test/test_rwcal_openstack.py index 6b0a2472..c2f54c21 100644 --- a/rwcal/test/test_rwcal_openstack.py +++ b/rwcal/test/test_rwcal_openstack.py @@ -28,7 +28,7 @@ from keystoneclient import v3 as ksclient from gi.repository import RwcalYang from gi.repository.RwTypes import RwStatus -from rift.rwcal.openstack.openstack_drv import KeystoneDriver, NovaDriver, KeystoneDriverV3, KeystoneDriverV2 +#from rift.rwcal.openstack.openstack_drv import KeystoneDriver, NovaDriver, KeystoneDriverV3, KeystoneDriverV2 logger = logging.getLogger('rwcal-openstack') @@ -43,10 +43,10 @@ ssh_pwauth: True # Important information about openstack installation. This needs to be manually verified # openstack_info = { - 'username' : 'pluto', - 'password' : 'mypasswd', - 'auth_url' : 'http://10.66.4.17:5000/v3/', - 'project_name' : 'demo', + 'username' : 'xxxxxx', + 'password' : 'xxxxx', + 'auth_url' : 'http://10.66.4.102:5000/v2.0/', + 'project_name' : 'xxxxx', 'mgmt_network' : 'private', 'reserved_flavor' : 'm1.medium', 'reserved_image' : 'Fedora-x86_64-20-20131211.1-sda-ping.qcow2', @@ -73,9 +73,9 @@ openstack_V3_info = { def get_cal_account(): """ - Creates an object for class RwcalYang.CloudAccount() + Creates an object for class RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList() """ - account = RwcalYang.CloudAccount() + account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList() account.name = "Gruntxx" account.account_type = "openstack" account.openstack.key = openstack_info['username'] @@ -236,9 +236,9 @@ class OpenStackTest(unittest.TestCase): def _get_image_info_request(self): """ - Returns request object of type RwcalYang.ImageInfoItem() + Returns request object of type RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList() """ - img = RwcalYang.ImageInfoItem() + img = RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList() img.name = "rift.cal.unittest.image" img.location = '/net/sharedfiles/home1/common/vm/rift-root-latest.qcow2' img.disk_format = "qcow2" @@ -286,9 +286,9 @@ class OpenStackTest(unittest.TestCase): def _get_flavor_info_request(self): """ - Returns request object of type RwcalYang.FlavorInfoItem() + Returns request object of type RwcalYang.YangData_RwProject_Project_VimResources_FlavorinfoList() """ - flavor = RwcalYang.FlavorInfoItem() + flavor = RwcalYang.YangData_RwProject_Project_VimResources_FlavorinfoList() flavor.name = 'rift.cal.unittest.flavor' flavor.vm_flavor.memory_mb = 16384 # 16GB flavor.vm_flavor.vcpu_count = 4 @@ -363,7 +363,7 @@ class OpenStackTest(unittest.TestCase): """ Returns request object of type RwcalYang.VMInfoItem """ - vm = RwcalYang.VMInfoItem() + vm = RwcalYang.YangData_RwProject_Project_VimResources_VminfoList() vm.vm_name = 'rift.cal.unittest.vm' vm.flavor_id = flavor_id vm.image_id = image_id @@ -544,6 +544,7 @@ class OpenStackTest(unittest.TestCase): rc = self.cal.do_delete_flavor(self._acct, flavor_id) self.assertEqual(rc, RwStatus.SUCCESS) + ''' @unittest.skip("Skipping test_expiry_token") def test_expiry_token(self): """ @@ -664,6 +665,7 @@ class OpenStackTest(unittest.TestCase): except Exception: auth_exp = True self.assertFalse(auth_exp) + ''' @unittest.skip("Skipping test_vm_operations") def test_vm_operations(self): @@ -693,9 +695,9 @@ class OpenStackTest(unittest.TestCase): def _get_network_info_request(self): """ - Returns request object of type RwcalYang.NetworkInfoItem + Returns request object of type RwcalYang.YangData_RwProject_Project_VimResources_NetworkinfoList """ - network = RwcalYang.NetworkInfoItem() + network = RwcalYang.YangData_RwProject_Project_VimResources_NetworkinfoList() network.network_name = 'rift.cal.unittest.network' network.subnet = '192.168.16.0/24' if openstack_info['physical_network']: @@ -760,9 +762,9 @@ class OpenStackTest(unittest.TestCase): def _get_port_info_request(self, network_id, vm_id): """ - Returns an object of type RwcalYang.PortInfoItem + Returns an object of type RwcalYang.YangData_RwProject_Project_VimResources_PortinfoList """ - port = RwcalYang.PortInfoItem() + port = RwcalYang.YangData_RwProject_Project_VimResources_PortinfoList() port.port_name = 'rift.cal.unittest.port' port.network_id = network_id if vm_id != None: @@ -885,10 +887,14 @@ class OpenStackTest(unittest.TestCase): """ logger.info("Openstack-CAL-Test: Test Get VDU List APIs") rc, rsp = self.cal.get_vdu_list(self._acct) - self.assertEqual(rc, RwStatus.SUCCESS) + self.assertEqual(rc.status, RwStatus.SUCCESS) logger.info("Openstack-CAL-Test: Received %d VDUs" %(len(rsp.vdu_info_list))) for vdu in rsp.vdu_info_list: - rc, vdu2 = self.cal.get_vdu(self._acct, vdu.vdu_id) + rc, vdu2 = self.cal.get_vdu(self._acct, vdu.vdu_id, "") + self.assertEqual(rc.status, RwStatus.SUCCESS) + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. self.assertEqual(vdu2.vdu_id, vdu.vdu_id) @@ -907,9 +913,9 @@ class OpenStackTest(unittest.TestCase): def _get_virtual_link_request_info(self): """ - Returns object of type RwcalYang.VirtualLinkReqParams + Returns object of type RwcalYang.YangData_RwProject_Project_VirtualLinkReqParams """ - vlink = RwcalYang.VirtualLinkReqParams() + vlink = RwcalYang.YangData_RwProject_Project_VirtualLinkReqParams() vlink.name = 'rift.cal.virtual_link' vlink.subnet = '192.168.1.0/24' if openstack_info['physical_network']: @@ -923,23 +929,29 @@ class OpenStackTest(unittest.TestCase): def _get_vdu_request_info(self, virtual_link_id): """ - Returns object of type RwcalYang.VDUInitParams + Returns object of type RwcalYang.YangData_RwProject_Project_VduInitParams """ - vdu = RwcalYang.VDUInitParams() + vdu = RwcalYang.YangData_RwProject_Project_VduInitParams() vdu.name = "cal.vdu" vdu.node_id = OpenStackTest.NodeID vdu.image_id = self._image.id + vdu.vm_flavor.memory_mb = 512 + vdu.vm_flavor.vcpu_count = 1 + vdu.vm_flavor.storage_gb = 4 vdu.flavor_id = self._flavor.id vdu.vdu_init.userdata = PING_USERDATA vdu.allocate_public_address = True - meta1 = vdu.supplemental_boot_data.custom_meta_data.add() - meta1.name = "EMS_IP" - meta1.data_type = "STRING" - meta1.value = "10.5.6.6" - #meta2 = vdu.supplemental_boot_data.custom_meta_data.add() - #meta2.name = "Cluster_data" - #meta2.data_type = "JSON" - #meta2.value = '''{ "cluster_id": "12" , "vnfc_id": "112" }''' + try: + meta1 = vdu.supplemental_boot_data.custom_meta_data.add() + meta1.name = "EMS_IP" + meta1.data_type = "STRING" + meta1.value = "10.5.6.6" + #meta2 = vdu.supplemental_boot_data.custom_meta_data.add() + #meta2.name = "Cluster_data" + #meta2.data_type = "JSON" + #meta2.value = '''{ "cluster_id": "12" , "vnfc_id": "112" }''' + except Exception as e: + pass #vdu.supplemental_boot_data.boot_data_drive = True customfile1 = vdu.supplemental_boot_data.config_file.add() customfile1.source = "abcdef124" @@ -955,9 +967,9 @@ class OpenStackTest(unittest.TestCase): def _get_vdu_modify_request_info(self, vdu_id, virtual_link_id): """ - Returns object of type RwcalYang.VDUModifyParams + Returns object of type RwcalYang.YangData_RwProject_Project_VduModifyParams """ - vdu = RwcalYang.VDUModifyParams() + vdu = RwcalYang.YangData_RwProject_Project_VduModifyParams() vdu.vdu_id = vdu_id c1 = vdu.connection_points_add.add() c1.name = "c_modify1" @@ -965,7 +977,144 @@ class OpenStackTest(unittest.TestCase): return vdu - @unittest.skip("Skipping test_create_delete_virtual_link_and_vdu") + def _get_rbsh_vdu_request_info(self, vlink_list): + """ + Returns object of type RwcalYang.YangData_RwProject_Project_VduInitParams + """ + vdu = RwcalYang.YangData_RwProject_Project_VduInitParams() + vdu.name = "cal_rbsh_vdu" + vdu.vm_flavor.memory_mb = 2048 + vdu.vm_flavor.vcpu_count = 1 + vdu.vm_flavor.storage_gb = 10 + vdu.flavor_id = self._flavor.id + vdu.allocate_public_address = True + ctr = 0 + for vl in vlink_list: + c1 = vdu.connection_points.add() + c1.name = "c_point" + str(ctr) + ctr += 1 + c1.virtual_link_id = vl + c1.type_yang = 'VIRTIO' + + vol0 = vdu.volumes.add() + vol0.name = "vda" + vol0.image = "mgmt.img" + vol0.size = 40 + vol0.boot_priority = 0 + vol0.device_bus = "virtio" + vol0.device_type = "disk" + + vol1 = vdu.volumes.add() + vol1.name = "vdb" + vol1.image = "segstore.img" + vol1.size = 60 + vol1.boot_priority = 1 + vol1.device_bus = "virtio" + vol1.device_type = "disk" + + # blank disk + vol2 = vdu.volumes.add() + vol2.name = "vdc" + vol2.size = 10 + vol2.boot_priority = 2 + vol2.device_bus = "virtio" + vol2.device_type = "disk" + + # existing volume disk + vol3 = vdu.volumes.add() + vol3.name = "vdd" + vol3.size = 10 + vol3.volume_ref = "volume-ref1" + vol3.boot_priority = 3 + vol3.device_bus = "virtio" + vol3.device_type = "disk" + return vdu + + @unittest.skip("Skipping test_create_rbsh_vdu") + def test_create_rbsh_vdu(self): + """ + Test to create VDU with mgmt port and 3 additional connection points + """ + logger.info("Openstack-CAL-Test: Test Create Virtual Link API") + vlink_list = [] + for ctr in range(3): + vlink = RwcalYang.YangData_RwProject_Project_VirtualLinkReqParams() + vlink.name = 'rift.cal.virtual_link' + str(ctr) + vlink.subnet = '11.0.{}.0/24'.format(str(1 + ctr)) + + rc, rsp = self.cal.create_virtual_link(self._acct, vlink) + self.assertEqual(rc.status, RwStatus.SUCCESS) + logger.info("Openstack-CAL-Test: Created virtual_link with Id: %s" %rsp) + vlink_id = rsp + + #Check if virtual_link create is successful + rc, rsp = self.cal.get_virtual_link(self._acct, rsp) + self.assertEqual(rc, RwStatus.SUCCESS) + self.assertEqual(rsp.virtual_link_id, vlink_id) + vlink_list.append(vlink_id) + + + # Now create VDU + vdu_req = self._get_rbsh_vdu_request_info(vlink_list) + logger.info("Openstack-CAL-Test: Test Create RB steelhead VDU API (w/ mgmt port) and 3 CPs") + + rc, rsp = self.cal.create_vdu(self._acct, vdu_req) + logger.debug("Openstack-CAL-Test: rc %s rsp %s" % (rc, rsp)) + self.assertEqual(rc.status, RwStatus.SUCCESS) + logger.info("Openstack-CAL-Test: Created vdu with Id: %s" %rsp) + + test_vdu_id = rsp + + ## Check if VDU get is successful + rc, rsp = self.cal.get_vdu(self._acct, test_vdu_id, "") + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. + self.assertEqual(rc.status, RwStatus.SUCCESS) + logger.debug("Get VDU response %s", rsp) + self.assertEqual(rsp.vdu_id, test_vdu_id) + + ### Wait until vdu_state is active + logger.debug("Waiting 10 secs") + time.sleep(10) + #{'name': 'dp0vhost7', 'connection_point_id': 'dp0vhost7', 'state': 'active', 'virtual_link_id': 'rift.cal.virtual_link', 'ip_address': '192.168.100.6'} + vdu_state = 'inactive' + cp_state = 'inactive' + for i in range(15): + rc, rsp = self.cal.get_vdu(self._acct, test_vdu_id, "") + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. + self.assertEqual(rc.status, RwStatus.SUCCESS) + logger.info("Openstack-CAL-Test: Iter %d VDU with id : %s. Reached State : %s, mgmt ip %s" %(i, test_vdu_id, rsp.state, rsp.management_ip)) + if (rsp.state == 'active') and ('management_ip' in rsp) and ('public_ip' in rsp): + vdu_state = 'active' + #'connection_points': [{'name': 'dp0vhost7', 'connection_point_id': 'dp0vhost7', 'state': 'active', 'virtual_link_id': 'rift.cal.virtual_link', 'ip_address': '192.168.100.6'}] + for cp in rsp.connection_points: + logger.info("Openstack-CAL-Test: Iter %d VDU with id : %s. Reached State : %s CP state %s" %(i, test_vdu_id, rsp.state, cp)) + logger.debug("Waiting another 5 secs") + time.sleep(5) + + self.assertEqual(rc, RwStatus.SUCCESS) + self.assertEqual(rsp.state, 'active') + self.assertEqual(vdu_state, 'active') + logger.info("Openstack-CAL-Test: VDU with id : %s reached expected state : %s IP: %s" %(test_vdu_id, rsp.state, rsp.management_ip)) + logger.info("Openstack-CAL-Test: VDUInfo: %s" %(rsp)) + logger.info("Waiting for 30 secs before deletion") + time.sleep(30) + + ### Check vdu list as well + rc, rsp = self.cal.get_vdu_list(self._acct) + self.assertEqual(rc.status, RwStatus.SUCCESS) + found = False + logger.debug("Get VDU response %s", rsp) + for vdu in rsp.vdu_info_list: + if vdu.vdu_id == test_vdu_id: + found = True + self.assertEqual(found, True) + logger.info("Openstack-CAL-Test: Passed VDU list" ) + + #@unittest.skip("Skipping test_create_delete_virtual_link_and_vdu") def test_create_delete_virtual_link_and_vdu(self): """ Test to create VDU @@ -994,18 +1143,30 @@ class OpenStackTest(unittest.TestCase): vdu_id = rsp ## Check if VDU create is successful - rc, rsp = self.cal.get_vdu(self._acct, rsp) + rc, rsp = self.cal.get_vdu(self._acct, rsp, "") + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. + + self.assertEqual(rc.status, RwStatus.SUCCESS) self.assertEqual(rsp.vdu_id, vdu_id) ### Wait until vdu_state is active for i in range(50): - rc, rs = self.cal.get_vdu(self._acct, vdu_id) - self.assertEqual(rc, RwStatus.SUCCESS) + rc, rs = self.cal.get_vdu(self._acct, vdu_id, "") + self.assertEqual(rc.status, RwStatus.SUCCESS) + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. + self.assertEqual(rc.status, RwStatus.SUCCESS) logger.info("Openstack-CAL-Test: VDU with id : %s. Reached State : %s" %(vdu_id, rs.state)) if rs.state == 'active': break - rc, rs = self.cal.get_vdu(self._acct, vdu_id) - self.assertEqual(rc, RwStatus.SUCCESS) + rc, rs = self.cal.get_vdu(self._acct, vdu_id, "") + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. + self.assertEqual(rc.status, RwStatus.SUCCESS) self.assertEqual(rs.state, 'active') logger.info("Openstack-CAL-Test: VDU with id : %s reached expected state : %s" %(vdu_id, rs.state)) logger.info("Openstack-CAL-Test: VDUInfo: %s" %(rs)) @@ -1019,10 +1180,10 @@ class OpenStackTest(unittest.TestCase): vlink_id2= rsp ### Now exercise the modify_vdu_api - vdu_modify = self._get_vdu_modify_request_info(vdu_id, vlink_id2) - rc = self.cal.modify_vdu(self._acct, vdu_modify) - self.assertEqual(rc, RwStatus.SUCCESS) - logger.info("Openstack-CAL-Test: Modified vdu with Id: %s" %vdu_id) + #vdu_modify = self._get_vdu_modify_request_info(vdu_id, vlink_id2) + #rc = self.cal.modify_vdu(self._acct, vdu_modify) + #self.assertEqual(rc, RwStatus.SUCCESS) + #logger.info("Openstack-CAL-Test: Modified vdu with Id: %s" %vdu_id) ### Lets delete the VDU self.cal.delete_vdu(self._acct, vdu_id) @@ -1036,7 +1197,7 @@ class OpenStackTest(unittest.TestCase): time.sleep(5) ### Verify that VDU and virtual link are successfully deleted rc, rsp = self.cal.get_vdu_list(self._acct) - self.assertEqual(rc, RwStatus.SUCCESS) + self.assertEqual(rc.status, RwStatus.SUCCESS) for vdu in rsp.vdu_info_list: self.assertNotEqual(vdu.vdu_id, vdu_id) @@ -1050,11 +1211,13 @@ class OpenStackTest(unittest.TestCase): def _get_vol_vdu_request_info(self, vlink_list): """ - Returns object of type RwcalYang.VDUInitParams + Returns object of type RwcalYang.YangData_RwProject_Project_VduInitParams """ - vdu = RwcalYang.VDUInitParams() + vdu = RwcalYang.YangData_RwProject_Project_VduInitParams() vdu.name = "cal_vdu" - vdu.flavor_id = self._flavor.id + vdu.vm_flavor.memory_mb = 512 + vdu.vm_flavor.vcpu_count = 1 + vdu.vm_flavor.storage_gb = 4 vdu.allocate_public_address = True ctr = 0 for vl in vlink_list: @@ -1068,23 +1231,29 @@ class OpenStackTest(unittest.TestCase): vol0.name = "vda" vol0.image = openstack_info['reserved_image'] vol0.size = 10 - vol0.boot_priority = 0 + try: + vol0.boot_priority = 0 + except Exception as e: + pass vol0.device_type = "disk" - meta1 = vol0.custom_meta_data.add() - meta1.name = "fs_type" - meta1.data_type = "STRING" - meta1.value = "ext4" + try: + meta1 = vol0.custom_meta_data.add() + meta1.name = "fs_type" + meta1.data_type = "STRING" + meta1.value = "ext4" + except Exception as e: + pass return vdu - #@unittest.skip("Skipping test_create_vol_vdu") + @unittest.skip("Skipping test_create_vol_vdu") def test_create_vol_vdu(self): """ Test to create VDU with mgmt port using Volumes """ logger.info("Openstack-CAL-Test: Test Create Virtual Link API") vlink_list = [] - vlink = RwcalYang.VirtualLinkReqParams() + vlink = RwcalYang.YangData_RwProject_Project_VirtualLinkReqParams() vlink.name = 'rift.cal.virtual_link' vlink.subnet = '11.0.1.0/24' @@ -1112,7 +1281,12 @@ class OpenStackTest(unittest.TestCase): test_vdu_id = rsp ## Check if VDU get is successful - rc, rsp = self.cal.get_vdu(self._acct, test_vdu_id) + rc, rsp = self.cal.get_vdu(self._acct, test_vdu_id, "") + self.assertEqual(rc.status, RwStatus.SUCCESS) + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. + logger.debug("Get VDU response %s", rsp) self.assertEqual(rsp.vdu_id, test_vdu_id) @@ -1123,8 +1297,11 @@ class OpenStackTest(unittest.TestCase): vdu_state = 'inactive' cp_state = 'inactive' for i in range(5): - rc, rsp = self.cal.get_vdu(self._acct, test_vdu_id) - self.assertEqual(rc, RwStatus.SUCCESS) + rc, rsp = self.cal.get_vdu(self._acct, test_vdu_id, "") + # Make changes for the third argument (currently None for mgmt_network). + # This is the mgmt_network published in the vdur (vdu.mgmt_network). + # Pass accordingly as per the use case of the test. + self.assertEqual(rc.status, RwStatus.SUCCESS) logger.info("Openstack-CAL-Test: VDU with id : %s. Reached State : %s, mgmt ip %s" %(test_vdu_id, rsp.state, rsp.management_ip)) if (rsp.state == 'active') and ('management_ip' in rsp) and ('public_ip' in rsp): vdu_state = 'active' @@ -1148,7 +1325,7 @@ class OpenStackTest(unittest.TestCase): ### Check vdu list as well rc, rsp = self.cal.get_vdu_list(self._acct) - self.assertEqual(rc, RwStatus.SUCCESS) + self.assertEqual(rc.status, RwStatus.SUCCESS) found = False logger.debug("Get VDU response %s", rsp) for vdu in rsp.vdu_info_list: @@ -1157,6 +1334,15 @@ class OpenStackTest(unittest.TestCase): self.assertEqual(found, True) logger.info("Openstack-CAL-Test: Passed VDU list" ) + @unittest.skip("Skipping test_validate_creds") + def test_validate_creds(self): + """ + Test validate creds + """ + logger.info("Openstack-CAL-Test: Test validate creds") + status = self.cal.validate_cloud_creds(self._acct) + logger.info("Openstack-CAL-Test: Passed validate creds") + class VmData(object): """A convenience class that provides all the stats and EPA Attributes from the VM provided