change imports as a module with osm_lcm prefix

[osm/LCM.git] / osm_lcm / ROclient.py

diff --git a/osm_lcm/ROclient.py b/osm_lcm/ROclient.py
index d79a88b..74e9212 100644 (file)
--- a/osm_lcm/ROclient.py
+++ b/osm_lcm/ROclient.py
@@ -319,7 +319,7 @@ class ROClient:
         other_done = 0
 
         for vim_action_set in action_descriptor["actions"]:
-            for vim_action in vim_action_set["vim_actions"]:
+            for vim_action in vim_action_set["vim_wim_actions"]:
                 if vim_action["item"] == "instance_vms":
                     vm_total += 1
                 elif vim_action["item"] == "instance_nets":
@@ -328,7 +328,7 @@ class ROClient:
                     other_total += 1
                 if vim_action["status"] == "FAILED":
                     return "ERROR", vim_action["error_msg"]
-                elif vim_action["status"] in ("DONE", "SUPERSEDED"):
+                elif vim_action["status"] in ("DONE", "SUPERSEDED", "FINISHED"):
                     if vim_action["item"] == "instance_vms":
                         vm_done += 1
                     elif vim_action["item"] == "instance_nets":
@@ -617,7 +617,7 @@ class ROClient:
                 for word in str(response_text).split(" "):
                     if "." in word:
                         version_text, _, _ = word.partition("-")
-                        return list(map(int, version_text.split(".")))
+                        return version_text
                 raise ROClientException("Got invalid version text: '{}'".format(response_text), http_code=500)
         except aiohttp.errors.ClientOSError as e:
             raise ROClientException(e, http_code=504)