Get image not path

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / vimapi / adaptor.py

diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py
index 8542e11..4415362 100644 (file)
--- a/lcm/lcm/pub/vimapi/adaptor.py
+++ b/lcm/lcm/pub/vimapi/adaptor.py
@@ -15,6 +15,7 @@
 import logging
 import time
 import json
+import os
 
 from lcm.pub.utils.values import ignore_case_get, set_opt_val
 from lcm.pub.msapi.aai import get_flavor_info
@@ -261,7 +262,7 @@ def create_port(vim_cache, res_cache, data, port, do_notify, res_type):
         ip_address.extend(fixed_ip_address)
     for one_virtual_network_interface in port["properties"].get("virtual_network_interface_requirements", []):
         interfaceTypeString = one_virtual_network_interface["network_interface_requirements"]["interfaceType"]
-        interfaceType = json.loads(interfaceTypeString)["configuration-value"]
+        interfaceType = json.loads(interfaceTypeString)["configurationValue"]
         vnic_type = ignore_case_get(port["properties"], "vnic_type")
         if vnic_type == "":
             if interfaceType == "SR-IOV":
@@ -369,7 +370,7 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type):
         for artifact in vm["artifacts"]:
             if artifact["artifact_name"] == "sw_image":
                 # TODO: after DM define
-                img_name = artifact["file"]
+                img_name = os.path.basename(artifact["file"])
                 break
         if not img_name:
             raise VimException("Undefined image(%s)" % vm["artifacts"], ERR_CODE)