X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fvnf%2Fims%2Forchestra_ims.py;h=213d690d816e16e92de5c7c39aa0137da078ccea;hb=457321c2c8ed7e8dcb1daccb6d2fd9814e6a98ca;hp=42b218e629a24d0166f8d96a70f4634e7e141d55;hpb=2ca4c18291457b77c4ab0181b68a98780b8dd734;p=functest.git

diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
old mode 100644
new mode 100755
index 42b218e62..213d690d8
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -78,9 +78,9 @@ def servertest(host, port):
 
 class ImsVnf(vnf_base.VnfOnBoardingBase):
 
-    def __init__(self, project='functest', case='orchestra_ims',
+    def __init__(self, project='functest', case_name='orchestra_ims',
                  repo='', cmd=''):
-        super(ImsVnf, self).__init__(project, case, repo, cmd)
+        super(ImsVnf, self).__init__(project, case_name, repo, cmd)
         self.ob_password = "openbaton"
         self.ob_username = "admin"
         self.ob_https = False
@@ -245,7 +245,7 @@ class ImsVnf(vnf_base.VnfOnBoardingBase):
                          % (self.imagename, network_id, userdata))
 
         instance = os_utils.create_instance_and_wait_for_active(
-            "m1.medium",
+            "orchestra",
             os_utils.get_image_id(glance_client, self.imagename),
             network_id,
             "orchestra-openbaton",
@@ -308,12 +308,21 @@ class ImsVnf(vnf_base.VnfOnBoardingBase):
         if self.ob_projectid == "":
             self.step_failure("Default project id was not found!")
 
+        creds = os_utils.get_credentials()
+        self.logger.info("PoP creds: %s" % creds)
+
+        project_id = os_utils.get_tenant_id(
+            os_utils.get_keystone_client(),
+            creds.get("project_name"))
+
+        self.logger.debug("project id: %s" % project_id)
+
         vim_json = {
             "name": "vim-instance",
-            "authUrl": os_utils.get_credentials().get("auth_url"),
-            "tenant": os_utils.get_credentials().get("tenant_name"),
-            "username": os_utils.get_credentials().get("username"),
-            "password": os_utils.get_credentials().get("password"),
+            "authUrl": creds.get("auth_url"),
+            "tenant": project_id,
+            "username": creds.get("username"),
+            "password": creds.get("password"),
             "securityGroups": [
                 "default",
                 "orchestra-sec-group"