SOL003 API Align

[vfc/nfvo/lcm.git] / lcm / ns_vnfs / biz / verify_vnfs.py

diff --git a/lcm/ns/vnfs/verify_vnfs.py b/lcm/ns_vnfs/biz/verify_vnfs.py
similarity index 96%
rename from lcm/ns/vnfs/verify_vnfs.py
rename to lcm/ns_vnfs/biz/verify_vnfs.py
index 2cc55a2..7c23dd5 100644 (file)
--- a/lcm/ns/vnfs/verify_vnfs.py
+++ b/lcm/ns_vnfs/biz/verify_vnfs.py
@@ -79,7 +79,7 @@ class VerifyVnfs(threading.Thread):
             "additionalParamForVnf": vnf_param,
             "vnfIndex": "1"
         }
-        ret = req_by_msb("/api/nslcm/v1/ns/vnfs", "POST", json.JSONEncoder().encode(inst_data))
+        ret = req_by_msb("/api/nslcm/v1/ns/ns_vnfs", "POST", json.JSONEncoder().encode(inst_data))
         if ret[0] != 0:
             raise NSLCMException("Failed to call inst vnf: %s" % ret[1])
         rsp_data = json.JSONDecoder().decode(ret[1])
@@ -115,7 +115,7 @@ class VerifyVnfs(threading.Thread):
             "terminationType": "forceful",
             "gracefulTerminationTimeout": "600"
         }
-        ret = req_by_msb("/api/nslcm/v1/ns/vnfs/%s" % self.vnf_inst_id, "POST", json.JSONEncoder().encode(term_data))
+        ret = req_by_msb("/api/nslcm/v1/ns/ns_vnfs/%s" % self.vnf_inst_id, "POST", json.JSONEncoder().encode(term_data))
         if ret[0] != 0:
             raise NSLCMException("Failed to call term vnf: %s" % ret[1])
         rsp_data = json.JSONDecoder().decode(ret[1])
@@ -211,7 +211,7 @@ class VerifyVnfs(threading.Thread):
         return job_end_normal
 
     def load_config(self):
-        json_file = os.path.join(os.path.dirname(__file__), 'verify_vnfs_config.json')
+        json_file = os.path.join(os.path.dirname(__file__), '../biz/verify_vnfs_config.json')
         f = open(json_file)
         json_data = json.JSONDecoder().decode(f.read())
         f.close()