summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--huawei/pom.xml4
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml2
-rwxr-xr-xhuawei/vnfmadapter/VnfmadapterService/docker/build_image.sh2
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/pom.xml4
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/pom.xml2
-rw-r--r--huawei/vnfmadapter/pom.xml4
-rw-r--r--pom.xml2
-rw-r--r--releases/ZTE-HuaWei-1.3.7-container.yaml12
-rw-r--r--version.properties2
-rw-r--r--zte/pom.xml4
-rwxr-xr-xzte/vmanager/docker/build_image.sh2
-rw-r--r--zte/vmanager/driver/urls.py2
-rw-r--r--zte/vmanager/pom.xml4
13 files changed, 29 insertions, 17 deletions
diff --git a/huawei/pom.xml b/huawei/pom.xml
index 871b6de7..a1f9386c 100644
--- a/huawei/pom.xml
+++ b/huawei/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-huawei</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm-huawei</name>
<description>vfc-nfvo-driver-vnfm-svnfm-huawei</description>
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
index 16cb1929..4e99f0e0 100644
--- a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
<artifactId>vnfmadapter-service-root</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
</parent>
<artifactId>hw-vnfmadapter-deployment</artifactId>
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
index 8cdb9b22..bea16256 100755
--- a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.3.6"
+VERSION="1.3.7"
PROJECT="vfc"
IMAGE="nfvo/svnfm/huawei"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/huawei/vnfmadapter/VnfmadapterService/pom.xml b/huawei/vnfmadapter/VnfmadapterService/pom.xml
index 4a85a6a0..e2fb23a2 100644
--- a/huawei/vnfmadapter/VnfmadapterService/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/pom.xml
@@ -19,10 +19,10 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
<artifactId>vnfmadapter</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
</parent>
<artifactId>vnfmadapter-service-root</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
<name>vfc/nfvo/drivers/vnfm/svnfm/huawei/vnfmadapter/VnfmadapterService</name>
<packaging>pom</packaging>
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
index 61d685e6..bcfb1483 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
<artifactId>vnfmadapter-service-root</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
</parent>
<artifactId>vnfmadapter-service</artifactId>
diff --git a/huawei/vnfmadapter/pom.xml b/huawei/vnfmadapter/pom.xml
index df8601f6..11262c64 100644
--- a/huawei/vnfmadapter/pom.xml
+++ b/huawei/vnfmadapter/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-huawei</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.huawei.vnfmadapter</groupId>
<artifactId>vnfmadapter</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm</name>
<description>nfvo vnfmadapter</description>
diff --git a/pom.xml b/pom.xml
index 7cfb38c6..b6cd62a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm</name>
<description>vfc-nfvo-driver-vnfm-svnfm</description>
diff --git a/releases/ZTE-HuaWei-1.3.7-container.yaml b/releases/ZTE-HuaWei-1.3.7-container.yaml
new file mode 100644
index 00000000..042051d0
--- /dev/null
+++ b/releases/ZTE-HuaWei-1.3.7-container.yaml
@@ -0,0 +1,12 @@
+distribution_type: 'container'
+container_release_tag: '1.3.7'
+project: 'vfc-nfvo-driver-vnfm-svnfm'
+container_pull_registry: nexus3.onap.org:10003
+container_push_registry: nexus3.onap.org:10002
+log_dir: 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily/1293/'
+ref: '8aaa4edff22a1e3c64852b9535eb269af8f6b7f6'
+containers:
+ - name: 'vfc/ztevnfmdriver'
+ version: '1.3.7-STAGING-20200917T093244'
+ - name: 'vfc/nfvo/svnfm/huawei'
+ version: '1.3.7-STAGING-20200917T093403'
diff --git a/version.properties b/version.properties
index 580af38c..d6a81060 100644
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
major=1
minor=3
-patch=6
+patch=7
base_version=${major}.${minor}.${patch}
diff --git a/zte/pom.xml b/zte/pom.xml
index 5612ee1e..1bce8e46 100644
--- a/zte/pom.xml
+++ b/zte/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-zte</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc/nfvo/driver/vnfm/svnfm/zte</name>
<description>vfc-nfvo-driver-vnfm-svnfm-zte</description>
diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh
index 52ae0518..4839d858 100755
--- a/zte/vmanager/docker/build_image.sh
+++ b/zte/vmanager/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.3.6"
+VERSION="1.3.7"
PROJECT="vfc"
IMAGE="ztevnfmdriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
diff --git a/zte/vmanager/driver/urls.py b/zte/vmanager/driver/urls.py
index 364c8e83..8fe1659d 100644
--- a/zte/vmanager/driver/urls.py
+++ b/zte/vmanager/driver/urls.py
@@ -21,7 +21,7 @@ urlpatterns = [
]
# regist to MSB when startup
-if REG_TO_MSB_WHEN_START:
+if REG_TO_MSB_WHEN_START == "true":
import json
from driver.pub.utils.restcall import req_by_msb
req_by_msb(REG_TO_MSB_REG_URL, "POST", json.JSONEncoder().encode(REG_TO_MSB_REG_PARAM))
diff --git a/zte/vmanager/pom.xml b/zte/vmanager/pom.xml
index 61e5d2b5..b28a8a1e 100644
--- a/zte/vmanager/pom.xml
+++ b/zte/vmanager/pom.xml
@@ -18,12 +18,12 @@
<parent>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-zte</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.zte.vmanager</groupId>
<artifactId>vfc-nfvo-driver-vnfm-svnfm-zte-vmanager</artifactId>
- <version>1.3.6-SNAPSHOT</version>
+ <version>1.3.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>vfc-nfvo-driver-vnfm-svnfm-zte</name>
<properties>