X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rwcal%2Ftest%2Fopenstack_resources.py;h=b4bc5ad585f74c3d7aaa8c2337257d836e29440c;hb=refs%2Fchanges%2F77%2F5477%2F1;hp=f7fb00dd7db055c0fe0e6c0295dcd0ed85a2045a;hpb=6f07e6f33f751ab4ffe624f6037f887b243bece2;p=osm%2FSO.git diff --git a/rwcal/test/openstack_resources.py b/rwcal/test/openstack_resources.py index f7fb00dd..b4bc5ad5 100755 --- a/rwcal/test/openstack_resources.py +++ b/rwcal/test/openstack_resources.py @@ -107,7 +107,7 @@ def get_cal_account(auth_url): """ Returns cal account """ - account = RwcalYang.CloudAccount() + account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList() account.account_type = "openstack" account.openstack.key = openstack_info['username'] account.openstack.secret = openstack_info['password'] @@ -222,7 +222,7 @@ class OpenstackResources(object): Creates a VM. The VM name is derived from username """ - vm = RwcalYang.VDUInitParams() + vm = RwcalYang.YangData_RwProject_Project_VduInitParams() vm.name = name vm.flavor_id = self._flavor_id vm.image_id = self._image_id @@ -239,7 +239,7 @@ class OpenstackResources(object): def create_network(self, name): logger.info("Creating network with name: %s" %name) - network = RwcalYang.NetworkInfoItem() + network = RwcalYang.YangData_RwProject_Project_VimResources_NetworkinfoList() network.network_name = name network.subnet = openstack_info['subnets'][openstack_info['subnet_index']] @@ -265,7 +265,7 @@ class OpenstackResources(object): def create_image(self, location): - img = RwcalYang.ImageInfoItem() + img = RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList() img.name = basename(location) img.location = location img.disk_format = "qcow2" @@ -299,7 +299,7 @@ class OpenstackResources(object): """ Create Flavor suitable for rift_ping_pong VNF """ - flavor = RwcalYang.FlavorInfoItem() + flavor = RwcalYang.YangData_RwProject_Project_VimResources_FlavorinfoList() flavor.name = FLAVOR_NAME flavor.vm_flavor.memory_mb = 16384 # 16GB flavor.vm_flavor.vcpu_count = 4