Merge "Solve ubuntu vi problem"

diff --git a/lcm/docker/instance_config.sh b/lcm/docker/instance_config.sh
index c15cb84..e5d9227 100755 (executable)
--- a/lcm/docker/instance_config.sh
+++ b/lcm/docker/instance_config.sh
@@ -19,6 +19,8 @@ if [ $SERVICE_IP ]; then
     sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
 fi
 
+sed -i "s/127.0.0.1:80/$MSB_IP:$MSB_PORT/" vfc/gvnfm/vnflcm/lcm/lcm/pub/config/config.py
+
 # Configure MYSQL
 if [ -z "$MYSQL_ADDR" ]; then
     export MYSQL_IP=`hostname -i`

diff --git a/lcm/lcm/nf/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnf_create/inst_vnf.py
index 9ae2515..b87602c 100644 (file)
--- a/lcm/lcm/nf/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnf_create/inst_vnf.py
@@ -338,7 +338,7 @@ def flavor_save(job_id, nf_inst_id, ret):
         swap=get_integer(ignore_case_get(ret, "swap")),
         isPublic=get_boolean(ignore_case_get(ret, "isPublic")),
         extraspecs=ignore_case_get(ret, "extraSpecs"),
-        is_predefined=ignore_case_get(ret, "returnCode"),
+        is_predefined=ret.get("returnCode", int(0)),
         instid=nf_inst_id)