diff options
20 files changed, 343 insertions, 33 deletions
@@ -8,11 +8,17 @@ project_lead: &onap_releng_ptl id: 'yangyan' company: 'China Mobile' timezone: 'Asia/Shanghai' +project_category: '' primary_contact: *onap_releng_ptl issue_tracking: type: 'jira' url: 'https://jira.onap.org/projects/VFC' key: 'VFC' +mailing_list: + type: 'groups.io' + url: 'lists.onap.org' + tag: '<[sub-project_name]>' +realtime_discussion: '' meetings: - type: 'zoom' agenda: 'https://wiki.onap.org/pages/viewpage.action?pageId=6590138' @@ -21,6 +27,21 @@ meetings: channel: 'n/a' repeats: 'weekly' time: '09:00 UTC' +repositories: + - 'vfc-gvnfm-vnflcm' + - 'vfc-gvnfm-vnfmgr' + - 'vfc-gvnfm-vnfres' + - 'vfc-nfvo-catalog' + - 'vfc-nfvo-db' + - 'vfc-nfvo-driver-ems' + - 'vfc-nfvo-driver-sfc' + - 'vfc-nfvo-driver-vnfm-gvnfm' + - 'vfc-nfvo-driver-vnfm-svnfm' + - 'vfc-nfvo-lcm' + - 'vfc-nfvo-multivimproxy' + - 'vfc-nfvo-resmanagement' + - 'vfc-nfvo-wfengine' + - 'vfc-oom' committers: - <<: *onap_releng_ptl - name: 'Anatoly Andrianov' @@ -88,11 +109,6 @@ committers: company: 'Boco' id: 'Wang_Guirong' timezone: 'Asia/Shanghai' - - name: 'Xiaodong Ning' - email: 'ningxiaodong2017@boco.com.cn' - company: 'Boco' - id: 'ningxiaodong2017' - timezone: 'Asia/Shanghai' - name: 'Adityakar Jha' email: 'Adityakar.Jha@ril.com' company: 'Ril' @@ -103,11 +119,6 @@ committers: company: 'Raisecom' id: 'donghu1102' timezone: 'Asia/Shanghai' - - name: 'Yufei Zhou' - email: 'yufei.zhou@nokia-sbell.com' - company: 'Nokia' - id: 'yufei_zhou' - timezone: 'Asia/Shanghai' - name: 'Denes Nemeth' email: 'denes.nemeth@nokia.com' company: 'Nokia' @@ -118,6 +129,22 @@ committers: company: 'Intel' id: 'haibin' timezone: 'Asia/Shanghai' + - name: 'LiLai' + email: 'lai.li@zte.com.cn' + company: 'ZTE' + id: 'laili' + timezone: 'Asia/Nanjing' + - name: 'Bharath Thiruveedula' + email: 'bharath.thiruveedula@verizon.com' + company: 'Verizon' + id: 'bharaththiruveedula' + timezone: 'Asia/Hyderabad' + - name: 'Ruoyu Ying' + email: 'ruoyu.ying@intel.com' + company: 'Intel' + id: 'Ruoyu' + timezone: 'Asia/ShangHai' + tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: diff --git a/gvnfmadapter/docker/build_image.sh b/gvnfmadapter/docker/build_image.sh index 7b52001..e4559ea 100755 --- a/gvnfmadapter/docker/build_image.sh +++ b/gvnfmadapter/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.2.2" +VERSION="1.3.0" PROJECT="vfc" IMAGE="gvnfmdriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/gvnfmadapter/driver/middleware.py b/gvnfmadapter/driver/middleware.py index 707589a..a4def17 100644 --- a/gvnfmadapter/driver/middleware.py +++ b/gvnfmadapter/driver/middleware.py @@ -41,10 +41,10 @@ class LogContextMiddleware(object): def process_request(self, request): # Fetch TRANSACTIONID Id and pass to plugin server - ReqeustID = request.META.get("HTTP_X_TRANSACTIONID", None) + ReqeustID = request.META.get("HTTP_X_ONAP-RequestID", None) if ReqeustID is None: ReqeustID = uuid.uuid3(uuid.NAMESPACE_URL, SERVICE_NAME) - request.META["HTTP_X_TRANSACTIONID"] = ReqeustID + request.META["HTTP_X_ONAP-RequestID"] = ReqeustID MDC.put("requestID", ReqeustID) # generate the unique id InovocationID = uuid.uuid3(uuid.NAMESPACE_DNS, SERVICE_NAME) diff --git a/gvnfmadapter/pom.xml b/gvnfmadapter/pom.xml index c97ad16..7086d7d 100644 --- a/gvnfmadapter/pom.xml +++ b/gvnfmadapter/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm.gvnfmadapter</groupId> <artifactId>vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter</name> <properties> diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml index db91137..44002a8 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <artifactId>juju-vnfmadapter-service-root</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>juju-vnfmadapterservice-deployment</artifactId> diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh index 8b1ef15..fe5e0cb 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh @@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.2.2" +VERSION="1.3.0" PROJECT="vfc" IMAGE="jujudriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml index 3df80c2..e459604 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <artifactId>juju-vnfmadapter</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>juju-vnfmadapter-service-root</artifactId> <name>vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter-vnfmadapterService</name> diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml index 8334792..3728790 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <artifactId>juju-vnfmadapter-service-root</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <artifactId>juju-vnfmadapter-service</artifactId> diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtilsTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtilsTest.java index 4d2e259..df4a68c 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtilsTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtilsTest.java @@ -22,6 +22,7 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; +import org.junit.Before; import org.junit.Test; import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.LocalComandUtils; import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.LocalComandUtils.ExeRes; @@ -31,18 +32,19 @@ import mockit.MockUp; public class LocalComandUtilsTest { + @Test - public void testformatCommand(){ - new MockUp<LocalComandUtils>(){ + public void testformatCommand() { + new MockUp<LocalComandUtils>() { @Mock - public String formatCommand(List<String> command){ - return null; + public String formatCommand(List<String> command) { + return null; } }; - List<String> command =new ArrayList<String> (); + List<String> command = new ArrayList<String>(); command.add("test1"); command.add("test2"); - String s=LocalComandUtils.formatCommand(command); + String s = LocalComandUtils.formatCommand(command); } @@ -55,4 +57,21 @@ public class LocalComandUtilsTest { constructor.newInstance(); } + @Test + public void testExecute() { + LocalComandUtils.execute("/test/data", "csi"); + } + + @Test + public void testFormatCommand2() { + + List<String> command = new ArrayList<String>(); + command.add("test1"); + command.add("test2"); + LocalComandUtils.formatCommand(command); + + } + + + } diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolderTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolderTest.java index 3a96a56..4b1f691 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolderTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolderTest.java @@ -40,6 +40,15 @@ public class SpringContextHolderTest { ctx.setApplicationContext(context); contextholder.cleanApplicationContext(); + + } + + @Test(expected = IllegalStateException.class) + public void testGetMethods() + { + SpringContextHolder.getApplicationContext(); + SpringContextHolder.getSpringBean("huawei"); + SpringContextHolder.getSpringBean("csi"); } } diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmExceptionTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmExceptionTest.java new file mode 100644 index 0000000..f1c276f --- /dev/null +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmExceptionTest.java @@ -0,0 +1,37 @@ +/* + * Copyright 2016-2017 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; + +import org.junit.Test; +import org.mockito.Mock; + +import static org.junit.Assert.*; + +public class VnfmExceptionTest { + @Mock + Throwable throwable; + + @Test + public void testConstructors() + { + VnfmException vnfmException= new VnfmException(); + VnfmException vnfmException1= new VnfmException("huawei",null); + VnfmException vnfmException2= new VnfmException("huawei"); + VnfmException vnfmException3= new VnfmException(throwable); + } + +}
\ No newline at end of file diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ExceptionArgsTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ExceptionArgsTest.java new file mode 100644 index 0000000..5e73018 --- /dev/null +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ExceptionArgsTest.java @@ -0,0 +1,45 @@ +/* + * Copyright 2016-2017 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.restclient; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class ExceptionArgsTest { + ExceptionArgs exceptionArgs =new ExceptionArgs(); + @Test + public void testConstructors() + { + + ExceptionArgs exceptionArgs1 =new ExceptionArgs(null,null,null,null); + + } + @Test + public void testGetterSetters() + { + exceptionArgs.setAdviceArgs(null); + exceptionArgs.setDescArgs(null); + exceptionArgs.setDetailArgs(null); + exceptionArgs.setReasonArgs(null); + exceptionArgs.getAdviceArgs(); + exceptionArgs.getDescArgs(); + exceptionArgs.getDetailArgs(); + exceptionArgs.getReasonArgs(); + } + +}
\ No newline at end of file diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/HttpRestTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/HttpRestTest.java new file mode 100644 index 0000000..79f9008 --- /dev/null +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/HttpRestTest.java @@ -0,0 +1,31 @@ +/* + * Copyright 2016-2017 Huawei Technologies Co., Ltd. + * + * 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. + */ +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.restclient; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class HttpRestTest { + HttpRest httpRest= new HttpRest(); + + @Test(expected = Exception.class) + public void testInitHttpRest() throws Exception + { + httpRest.initHttpRest(null); + } + +}
\ No newline at end of file diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ReaderHelperTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ReaderHelperTest.java new file mode 100644 index 0000000..4923843 --- /dev/null +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ReaderHelperTest.java @@ -0,0 +1,35 @@ +/* + * Copyright 2016-2017 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.restclient; + +import org.junit.Test; + +public class ReaderHelperTest { + + @Test + public void testConstructors() { + ReaderHelper readerHelper = new ReaderHelper(null); + } + + @Test + public void testGetLine() { + ReaderHelper readerHelper = new ReaderHelper(null); + readerHelper.getLine(); + + + } +}
\ No newline at end of file diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ServiceExceptionTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ServiceExceptionTest.java new file mode 100644 index 0000000..3fe4e10 --- /dev/null +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/restclient/ServiceExceptionTest.java @@ -0,0 +1,58 @@ +/* + * Copyright 2016-2017 Huawei Technologies Co., Ltd. + * + * 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. + */ + +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.restclient; + +import org.junit.Test; +import org.mockito.Mock; + +import static org.junit.Assert.*; + +public class ServiceExceptionTest { + @Mock + Throwable throwable; + @Mock + ExceptionArgs exceptionArgs; + ServiceException serviceException = new ServiceException(); + + @Test + public void testConstructors() + { + Object object= new Object(); + ServiceException serviceException1 = new ServiceException("huawei",throwable); + ServiceException serviceException2 = new ServiceException("huawei"); + ServiceException serviceException3 = new ServiceException("huawei","huawei"); + ServiceException serviceException4 = new ServiceException("huawei",200); + ServiceException serviceException5 = new ServiceException(200,"huawei"); + ServiceException serviceException6 = new ServiceException("huawei",200,exceptionArgs); + ServiceException serviceException7 = new ServiceException("200","huawei",object); + ServiceException serviceException8 = new ServiceException("200","huawei",throwable,object); + ServiceException serviceException9 = new ServiceException("200","huawei",throwable); + ServiceException serviceException10 = new ServiceException(throwable); + + + } + @Test + public void testGettermethods() + { + serviceException.getArgs(); + serviceException.getExceptionArgs(); + serviceException.getId(); + serviceException.setId(null); + serviceException.getId(); + } + +}
\ No newline at end of file diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManagerTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManagerTest.java new file mode 100644 index 0000000..91f1141 --- /dev/null +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManagerTest.java @@ -0,0 +1,48 @@ +/* + * Copyright 2016-2017 Huawei Technologies Co., Ltd. + * + * 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. + */ + + +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; + +import net.sf.json.JSONObject; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; + + +import java.util.HashMap; +import java.util.Map; + +import static org.junit.Assert.*; + +public class JujuAdapter2DriverManagerTest { + + + + @Test + public void testRegisterDriver() + { + JujuAdapter2DriverManager jujuAdapter2DriverManager =new JujuAdapter2DriverManager(); + Map<String, String> map = new HashMap<String, String>(); + map.put("a", "1"); + JSONObject json = new JSONObject(); + json.put("sun","yellow"); + jujuAdapter2DriverManager.registerDriver(map,json); + + jujuAdapter2DriverManager.unregisterDriver(map); + + } +}
\ No newline at end of file diff --git a/juju/juju-vnfmadapter/pom.xml b/juju/juju-vnfmadapter/pom.xml index 47f7933..b3727f2 100644 --- a/juju/juju-vnfmadapter/pom.xml +++ b/juju/juju-vnfmadapter/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <artifactId>juju</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <modelVersion>4.0.0</modelVersion> <artifactId>juju-vnfmadapter</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-gvnfm-juju-vnfmadapter</name> <description>nfvo juju-vnfmadapter</description> @@ -47,6 +47,7 @@ <include>**/*Test.scala</include> <include>**/*TestCase.scala</include> </includes> + <useSystemClassLoader>false</useSystemClassLoader> </configuration> </plugin> diff --git a/juju/pom.xml b/juju/pom.xml index 4515cb9..2ca1c45 100644 --- a/juju/pom.xml +++ b/juju/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> </parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <modelVersion>4.0.0</modelVersion> <artifactId>juju</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-gvnfm-juju</name> <description>nfvo juju-vnfmadapter</description> @@ -18,12 +18,12 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.2.0</version> + <version>1.2.3</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vfc.nfvo.driver.vnfm.gvnfm</groupId> <artifactId>vfc-nfvo-driver-vnfm-gvnfm</artifactId> - <version>1.2.2-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>vfc-nfvo-driver-vnfm-gvnfm</name> <description>vfc nfvo drivers-vnfm-gvnfm</description> diff --git a/version.properties b/version.properties index 6d6c581..75e785b 100644 --- a/version.properties +++ b/version.properties @@ -18,8 +18,8 @@ # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=2 -patch=2 +minor=3 +patch=0 base_version=${major}.${minor}.${patch} |