Merge "Define constants instead of duplicating literal"

diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml
index 48ae570..e2c0ba3 100644 (file)
--- a/huawei/vnfmadapter/pom.xml
+++ b/huawei/vnfmadapter/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>vnfmadapter</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter</name>
+    <name>vfc-nfvo-driver-vnfm-svnfm</name>
     <description>nfvo vnfmadapter</description>
     <modules>
         <module>VnfmadapterService</module>

diff --git a/zte/vmanager/docker/instance_config.sh b/zte/vmanager/docker/instance_config.sh
index d4169a3..4995e5e 100755 (executable)
--- a/zte/vmanager/docker/instance_config.sh
+++ b/zte/vmanager/docker/instance_config.sh
@@ -13,8 +13,6 @@ fi
 
 if [ $SERVICE_IP ]; then
     sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py
-    sed -i "s|127\.0\.0\.1|$SERVICE_IP|" vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/run.sh
-    sed -i "s|127\.0\.0\.1|$SERVICE_IP|" vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/stop.sh
 fi
 
 cat vfc/nfvo/driver/vnfm/svnfm/zte/vmanager/driver/pub/config/config.py

diff --git a/zte/vmanager/run.sh b/zte/vmanager/run.sh
index 4ed4445..111e9fc 100755 (executable)
--- a/zte/vmanager/run.sh
+++ b/zte/vmanager/run.sh
@@ -12,5 +12,4 @@
 # 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.
-sip=127.0.0.1
-nohup python manage.py runserver $sip:8410 > /dev/null &
+nohup python manage.py runserver 0.0.0.0:8410 > /dev/null &

diff --git a/zte/vmanager/stop.sh b/zte/vmanager/stop.sh
index a4f5c8a..8848e16 100755 (executable)
--- a/zte/vmanager/stop.sh
+++ b/zte/vmanager/stop.sh
@@ -12,5 +12,4 @@
 # 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.
-sip=127.0.0.1
-ps auxww | grep "manage.py runserver $sip:8410" | awk '{print $2}' | xargs kill -9
+ps auxww | grep "manage.py runserver 0.0.0.0:8410" | awk '{print $2}' | xargs kill -9