Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Modify code of create vnf identifier
[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
fa90653
..
b7a0a9a
100644
(file)
--- a/
lcm/lcm/pub/msapi/nfvolcm.py
+++ b/
lcm/lcm/pub/msapi/nfvolcm.py
@@
-11,17
+11,26
@@
# 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.
# 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
+from lcm.pub.exceptions import NFLCMException
from lcm.pub.utils.restcall import req_by_msb
from lcm.pub.utils.restcall import req_by_msb
+logger = logging.getLogger(__name__)
+
+
#call gvnfm driver
#call gvnfm driver
-def
vnfd_rawdata_get
(vnfdid):
+def
get_packageinfo_by_vnfdid
(vnfdid):
ret = req_by_msb("openoapi/nslcm/v1/vnfs/%s" % vnfdid, "GET")
ret = req_by_msb("openoapi/nslcm/v1/vnfs/%s" % vnfdid, "GET")
- return ret
+ 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
#call gvnfm driver
-def
get_packageid_by_vnfdid(vnfdid
):
- ret = req_by_msb("openoapi/nslcm/v1/vnfs/%s" % vnfdid, "GET")
+def
vnfd_rawdata_get(vnfdid, data
):
+ ret = req_by_msb("openoapi/nslcm/v1/vnfs/%s" % vnfdid, "GET"
, data
)
return ret
#call gvnfm driver
return ret
#call gvnfm driver