Modify test case of apply_grant

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / msapi / nfvolcm.py

diff --git a/lcm/lcm/pub/msapi/nfvolcm.py b/lcm/lcm/pub/msapi/nfvolcm.py
index 755f335..b2d7440 100644 (file)
--- a/lcm/lcm/pub/msapi/nfvolcm.py
+++ b/lcm/lcm/pub/msapi/nfvolcm.py
@@ -11,15 +11,37 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import json
+import logging
 
-# Query vnfd_rawdata by vnfdid
+from lcm.pub.exceptions import NFLCMException
 from lcm.pub.utils.restcall import req_by_msb
 
+logger = logging.getLogger(__name__)
 
-def vnfd_rawdata_get(vnfdid):
-    ret = req_by_msb("openoapi/nslcm/v1/vnfpackage/%s" % vnfdid, "GET")
-    return ret
 
+#call gvnfm driver
+def get_packageinfo_by_vnfdid(vnfdid):
+    ret = req_by_msb("openoapi/nslcm/v1/vnfs/%s" % vnfdid, "GET")
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Failed to query package_info of vnfdid(%s) from nslcm." % vnfdid)
+    return json.JSONDecoder().decode(ret[1])
+
+#call gvnfm driver
 def apply_grant_to_nfvo(data):
-    ret = req_by_msb("openoapi/nslcm/v1/vnfpackage" , "GET", data)
+    ret = req_by_msb("openoapi/nslcm/v1/grantvnf" , "POST", data)
+    if ret[0] != 0:
+        logger.error("Status code is %s, detail is %s.", ret[2], ret[1])
+        raise NFLCMException("Nf instancing apply grant exception")
+    return json.JSONDecoder().decode(ret[1])
+
+#call gvnfm driver
+def notify_lcm_to_nfvo(data, nf_inst_id):
+    ret = req_by_msb("openoapi/nslcm/v1/vnfs/%s/Notify"%nf_inst_id, "POST", data)
+    return ret
+
+#call gvnfm driver
+def apply_res_to_nfvo(data):
+    ret = req_by_msb("openoapi/nslcm/v1/res" , "POST", data)
     return ret
\ No newline at end of file