diff options
7 files changed, 161 insertions, 70 deletions
@@ -1,15 +1,15 @@ --- -project: 'so-adapters-so-nssmf-adapter' -project_creation_date: '2020-01-30' -lifecycle_state: 'Incubation' +project: 'so/adapters/so-nssmf-adapter' +project_creation_date: '2017-06-15' +lifecycle_state: 'Mature' project_category: '' -project_lead: &onap_so_ptl - name: 'Seshu Kumar' +project_lead: &onap_releng_ptl + name: 'Seshu Kumar M' email: 'seshu.kumar.m@huawei.com' id: 'seshukm' - company: 'Huawei' + company: 'Huawei Technologies India Pvt Ltd' timezone: 'India/Bangalore' -primary_contact: *onap_so_ptl +primary_contact: *onap_releng_ptl issue_tracking: type: 'jira' url: 'https://jira.onap.org/projects/SO' @@ -21,49 +21,124 @@ mailing_list: realtime_discussion: '' meetings: - type: 'zoom' - agenda: '' + agenda: 'https://wiki.onap.org/display/DW/Service+Orchestrator+Project' url: 'https://wiki.onap.org/display/DW/Service+Orchestrator+Project' server: 'n/a' channel: 'n/a' repeats: 'weekly' - time: '13:30 UTC' + time: '12:30 UTC' repositories: - - so/adapters/so-nssmf-adapter + - 'so/adapters/so-nssmf-adapter' committers: - - <<: *onap_so_ptl - - name: 'Chuanyu Chen' - email: 'chenchuanyu@huawei.com' - company: 'Huawei' - id: 'boychuanyu' - timezone: 'Asia/Shanghai' + - <<: *onap_releng_ptl - name: 'Byung-Woo Jun' email: 'byung-woo.jun@ericsson.com' company: 'Ericsson' id: 'byungwoojun' timezone: 'America/New_York' - - name: 'Max Benjamin' - email: 'max.benjamin@att.com' - company: 'ATT' - id: 'mfour' - timezone: 'America/New_York' - - name: 'Steve Smokowski' - email: 'ss835w@att.com' - company: 'ATT' - id: 'stevesmokowski' - timezone: 'America/New_York' - - name: 'Lukasz Muszkieta' - email: 'lukasz.muszkieta@nokia.com' - company: 'Nokia' - id: 'lukaszM' - timezone: 'Europe/Warsaw' - - name: 'Ramesh Parthasarathy' - email: 'ramesh.parthasarathy@att.com' - company: 'ATT' - id: 'parthasram' - timezone: 'America/Los_Angeles' + - name: 'Waqas Ikram' + email: 'waqas.ikram@est.tech' + company: 'Ericsson' + id: 'waqas.ikram' + timezone: 'Ireland/Dublin' + - name: 'Lukasz Rajewski' + email: 'lukasz.rajewski@orange.com' + company: 'Orange' + id: 'rajewluk' + timezone: 'Poland/Warsaw' + - name: 'Shashikanth VH' + email: 'shashikanth.vh@huawei.com' + company: 'Huawei Technologies India Pvt Ltd' + id: 'shashikanth.vh' + timezone: 'India/Bangalore' + - name: 'Jozsef Csongvai' + email: 'jozsef.csongvai@bell.ca' + company: 'Bell Canada' + id: 'jozsef' + timezone: 'Canada/Ontario' + - name: 'Md Irshad Sheikh' + email: 'md.irshad.sheikh@huawei.com' + company: 'Huawei Technologies India Pvt Ltd' + id: 'irshad97' + timezone: 'India/Bangalore' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: + - type: 'removal' + name: 'Tal Liron' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Heliu Zhong' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Yuanwei Yang' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Christophe Closset' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Claude Noshpitz' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'maopeng zhang' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Bin Hou' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Fu Jinhua' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Jie Feng' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'jackie tian' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' + name: 'Deng Hui' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'addition' + name: 'Marcus Williams' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'addition' + name: 'Sanchita Pathak' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'addition' + name: 'Steve Smokowski' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' + - type: 'addition' + name: 'Subhash Kumar Singh' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' + - type: 'addition' + name: 'Lukasz Muszkieta' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' + - type: 'removal' + name: 'Rob Daugherty' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' + - type: 'addition' + name: 'Max Benjamin' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' + - type: 'removal' + name: 'DeWayne Filppi' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' + name: 'Yan Yang' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' + name: 'Marcus Williams' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' + name: 'Sanchita Pathak' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' + name: 'Subhash Kumar Singh' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' - type: 'addition' name: 'Ramesh Parthasarathy' link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' + name: 'Max Benjamin' + link: 'https://wiki.onap.org/display/DW/2021+TSC+Decisions' + - type: 'removal' + name: 'Steve' + link: 'https://wiki.onap.org/display/Meetings/TSC+2022-03-03' diff --git a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterControllerTest.java b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterControllerTest.java index 3a57938..a4cdde5 100644 --- a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterControllerTest.java +++ b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterControllerTest.java @@ -22,7 +22,6 @@ package org.onap.so.adapters.nssmf.controller; import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.onap.so.adapters.nssmf.controller.NssmfAdapterController;
import org.onap.so.adapters.nssmf.service.NssmfManagerService;
import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;
import org.springframework.http.ResponseEntity;
@@ -34,7 +33,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
-import static org.onap.so.beans.nsmf.NetworkType.CORE;
@RunWith(SpringRunner.class)
public class NssmfAdapterControllerTest {
diff --git a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/entity/RestResponseTest.java b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/entity/RestResponseTest.java index d80359d..afda23e 100644 --- a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/entity/RestResponseTest.java +++ b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/entity/RestResponseTest.java @@ -24,7 +24,8 @@ import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringRunner;
import java.util.HashMap;
import java.util.Map;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
@RunWith(SpringRunner.class)
public class RestResponseTest {
diff --git a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/exceptions/ApplicationExceptionTest.java b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/exceptions/ApplicationExceptionTest.java index 27043bb..ae83006 100644 --- a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/exceptions/ApplicationExceptionTest.java +++ b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/exceptions/ApplicationExceptionTest.java @@ -24,7 +24,8 @@ import org.junit.Test; import org.junit.runner.RunWith;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
@RunWith(SpringRunner.class)
public class ApplicationExceptionTest {
diff --git a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImplTest.java b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImplTest.java index 6bb70ea..df49953 100644 --- a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImplTest.java +++ b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImplTest.java @@ -27,8 +27,6 @@ import org.apache.http.HttpResponse; import org.apache.http.StatusLine;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.conn.util.DomainType;
-import org.ehcache.config.ResourceType;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,17 +41,41 @@ import org.onap.so.adapters.nssmf.enums.ActionType; import org.onap.so.adapters.nssmf.enums.HttpMethod;
import org.onap.so.adapters.nssmf.exceptions.ApplicationException;
import org.onap.so.adapters.nssmf.util.RestUtil;
-import org.onap.so.beans.nsmf.*;
+import org.onap.so.beans.nsmf.ActDeActNssi;
+import org.onap.so.beans.nsmf.AllocateAnNssi;
+import org.onap.so.beans.nsmf.AllocateCnNssi;
+import org.onap.so.beans.nsmf.AllocateTnNssi;
+import org.onap.so.beans.nsmf.AnSliceProfile;
+import org.onap.so.beans.nsmf.ConnectionLink;
+import org.onap.so.beans.nsmf.CnSliceProfile;
+import org.onap.so.beans.nsmf.DeAllocateNssi;
+import org.onap.so.beans.nsmf.EsrInfo;
+import org.onap.so.beans.nsmf.JobStatusResponse;
+import org.onap.so.beans.nsmf.PerfReq;
+import org.onap.so.beans.nsmf.PerfReqEmbb;
+import org.onap.so.beans.nsmf.QuerySubnetCapability;
+import org.onap.so.beans.nsmf.NetworkType;
+import org.onap.so.beans.nsmf.NsiInfo;
+import org.onap.so.beans.nsmf.NssiResponse;
+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;
+import org.onap.so.beans.nsmf.NssmfRequest;
+import org.onap.so.beans.nsmf.ResponseDescriptor;
+import org.onap.so.beans.nsmf.ServiceInfo;
+import org.onap.so.beans.nsmf.TnSliceProfile;
+import org.onap.so.beans.nsmf.TransportSliceNetwork;
+import org.onap.so.beans.nsmf.UeMobilityLevel;
import org.onap.so.db.request.beans.ResourceOperationStatus;
import org.onap.so.db.request.data.repository.ResourceOperationStatusRepository;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit4.SpringRunner;
-import javax.persistence.Access;
-import javax.persistence.ManyToOne;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Field;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -63,7 +85,9 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks;
import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;
import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.unMarshal;
-import static org.onap.so.beans.nsmf.NetworkType.*;
+import static org.onap.so.beans.nsmf.NetworkType.ACCESS;
+import static org.onap.so.beans.nsmf.NetworkType.CORE;
+import static org.onap.so.beans.nsmf.NetworkType.TRANSPORT;
import static org.onap.so.beans.nsmf.ResourceSharingLevel.NON_SHARED;
@RunWith(SpringRunner.class)
diff --git a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/util/RestUtilTest.java b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/util/RestUtilTest.java index 5d07c5e..2d1174c 100644 --- a/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/util/RestUtilTest.java +++ b/so-nssmf-adapter-application/src/test/java/org/onap/so/adapters/nssmf/util/RestUtilTest.java @@ -19,24 +19,17 @@ */
package org.onap.so.adapters.nssmf.util;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.StatusLine;
import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.hibernate.jdbc.Expectations;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
-import org.mockito.stubbing.Answer;
import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.so.adapters.nssmf.entity.NssmfInfo;
import org.onap.so.adapters.nssmf.entity.RestResponse;
import org.onap.so.adapters.nssmf.enums.HttpMethod;
import org.onap.so.adapters.nssmf.exceptions.ApplicationException;
@@ -47,11 +40,10 @@ import org.springframework.test.context.junit4.SpringRunner; import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
-import java.util.Optional;
import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-import static org.mockito.MockitoAnnotations.initMocks;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
import static org.onap.so.beans.nsmf.NetworkType.CORE;
@RunWith(SpringRunner.class)
diff --git a/version.properties b/version.properties index 5588bd4..5f787d9 100755 --- a/version.properties +++ b/version.properties @@ -1,13 +1,13 @@ -# Versioning variables
-# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
-# because they are used in Jenkins, whose plug-in doesn't support
-
-major=1
-minor=9
-patch=1
-
-base_version=${major}.${minor}.${patch}
-
-# Release must be completed with git revision # in Jenkins
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
+# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support.. + +major=1 +minor=10 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT |