summaryrefslogtreecommitdiffstats
path: root/nokia/vnfmdriver
diff options
context:
space:
mode:
Diffstat (limited to 'nokia/vnfmdriver')
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json2
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json2
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile2
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak54
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh2
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml53
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java4
-rw-r--r--nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java17
8 files changed, 46 insertions, 90 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json
index f3d5440f..14febf44 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json
+++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json
@@ -3,7 +3,7 @@
"driverName": "nokiavnfmdriver",
"instanceID": "nokiavnfm-0-1",
"ip": "127.0.0.1",
- "port": "8485",
+ "port": "8486",
"protocol": "http",
"services": [{
"service_url": "/api/nokiavnfmdriver/v1",
diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
index 27d395d2..017c8944 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
+++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
@@ -7,7 +7,7 @@
"nodes": [
{
"ip": "127.0.0.1",
- "port": "8485",
+ "port": "8486",
"ttl": 0
}
]
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
index ccd5173c..6bcd1dbb 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile
@@ -41,7 +41,7 @@ RUN wget -q -O nfvo-driver-vnfm-nokia-1.0.0-SNAPSHOT.zip "https://nexus.onap.org
# Set permissions
RUN find . -type d -exec chmod o-w {} \;
RUN find . -name "*.sh" -exec chmod +x {} \;
-EXPOSE 8485
+EXPOSE 8486
RUN echo ONAP nfvo-driver-vnfm-nokia 1.0.0-SNAPSHOT "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm&a=vfcadaptor-deployment&v=LATEST&e=zip" > ONAP_VERSION
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak
deleted file mode 100644
index cf567be3..00000000
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2017, Nokia Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-#
-#
-# This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually.
-#
-# nfvo-driver-vnfm-nokia/target/docker-entrypoint.sh
-#
-DIRNAME=`dirname $0`
-DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
-echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
-cd ${DOCKER_BUILD_DIR}
-
-BUILD_ARGS="--no-cache"
-ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
-PROJECT="vfc"
-IMAGE="nfvo/svnfm/nokia"
-DOCKER_REPOSITORY="nexus3.onap.org:10003"
-IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
-
-if [ $HTTP_PROXY ]; then
- BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
-fi
-if [ $HTTPS_PROXY ]; then
- BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
-fi
-
-function build_image {
- echo "Start build docker image: ${IMAGE_NAME}"
- docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
-}
-
-function push_image {
- echo "Start push docker image: ${IMAGE_NAME}"
- docker push ${IMAGE_NAME}:${VERSION}
- docker push ${IMAGE_NAME}:latest
-}
-
-build_image
-push_image
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh
index 50fc17f5..a11592cf 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/init-mysql.sh
@@ -17,6 +17,6 @@
# Wait for mysql to initialize; Set mysql root password
echo Initializing mysql
for i in {1..10}; do
- /usr/bin/mysqladmin -u root password 'rootpass' &> /dev/null && break
+ /usr/bin/mysqladmin -u vnfm password 'vnfmpass' &> /dev/null && break
sleep $i
done
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
index 827af562..3bdebb80 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
@@ -96,31 +96,36 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
-
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
+
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.39</version>
</dependency>
-
- <dependency>
- <groupId>org.onap.msb.java-sdk</groupId>
- <artifactId>msb-java-sdk</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard</groupId>
- <artifactId>dropwizard-core</artifactId>
- <version>0.8.0</version>
- </dependency>
+
+ <dependency>
+ <groupId>org.onap.msb.java-sdk</groupId>
+ <artifactId>msb-java-sdk</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-core</artifactId>
+ <version>0.8.0</version>
+ </dependency>
</dependencies>
<build>
<!--
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java
index dc2b8c0c..a7cab38a 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/VfcadaptorApplication.java
@@ -28,10 +28,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@ComponentScan
public class VfcadaptorApplication {
- private VfcadaptorApplication() {
-
- }
-
public final static void main(String[] args) {
SpringApplication.run(VfcadaptorApplication.class, args);
}
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
index 675229f1..5d488854 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
@Component
@@ -46,16 +47,19 @@ public class MsbMgmrImpl implements IMsbMgmr {
public void register() {
try {
String vfcAdaptorInfoJsonStr = readVfcAdaptorInfoFromJsonFile();
- MicroServiceInfo msinfo = gson.fromJson(vfcAdaptorInfoJsonStr, MicroServiceInfo.class);
+// MicroServiceInfo msinfo = gson.fromJson(vfcAdaptorInfoJsonStr, MicroServiceInfo.class);
+
+ JSON json = com.alibaba.fastjson.JSON.parseObject(vfcAdaptorInfoJsonStr);
+ MicroServiceInfo msinfo = com.alibaba.fastjson.JSON.toJavaObject(json , MicroServiceInfo.class);
MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
MicroServiceFullInfo microServiceInfo = msbClient.registerMicroServiceInfo(msinfo);
logger.info("Registered service response info is " + microServiceInfo.toString());
- } catch (IOException e) {
- logger.error("Failed to read vfcadaptor info! ", e);
} catch (RouteException e) {
- logger.error("Failed to register nokia vnfm driver! ", e);
+ logger.error("RouteException Failed to register nokia vnfm driver! ", e);
+ } catch (IOException e) {
+ logger.error("IOException Failed to register nokia vnfm driver! ", e);
}
}
@@ -105,5 +109,10 @@ public class MsbMgmrImpl implements IMsbMgmr {
public void setAdaptorEnv(AdaptorEnv env) {
this.adaptorEnv = env;
}
+
+ public static final void main(String[] args) {
+ MsbMgmrImpl impl = new MsbMgmrImpl();
+ impl.register();
+ }
}