summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ms/neng/opt/etc/config/application-live.properties13
-rw-r--r--ms/neng/src/main/docker/startService.sh15
-rw-r--r--ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/PolicyFinderServiceImpl.java5
-rw-r--r--ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/AaiResponseTest.java41
-rw-r--r--ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceTest.java5
-rw-r--r--ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/GeneratedNameTest.java90
-rw-r--r--ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/IdentifierMapTest.java98
-rw-r--r--ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/PolicyDetailsTest.java75
-rw-r--r--ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestInputTest.java106
-rw-r--r--ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestTest.java67
-rw-r--r--ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseOutputTest.java77
-rw-r--r--ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseTest.java66
-rw-r--r--ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestInputTest.java67
-rw-r--r--ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestTest.java63
-rw-r--r--ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java18
15 files changed, 801 insertions, 5 deletions
diff --git a/ms/neng/opt/etc/config/application-live.properties b/ms/neng/opt/etc/config/application-live.properties
index 23feb8de..1af9d48f 100644
--- a/ms/neng/opt/etc/config/application-live.properties
+++ b/ms/neng/opt/etc/config/application-live.properties
@@ -28,3 +28,16 @@ datasource.db.password=${neng_db_pass}
jpa.hibernate.ddl-auto=none
jpa.show-sql=true
hibernate.show_sql:true
+
+#Interface with policy manager
+policymgr.clientAuth=Basic ${pol_client_auth}
+policymgr.basicAuth=Basic ${pol_basic_auth}
+policymgr.url=${pol_url}
+policymgr.environment=${pol_env}
+policymgr.ecompRequestId=${pol_req_id}
+
+#Interface with A&AI
+aai.certPassword=${aai_cert_pass}
+aai.cert=${aai_cert_path}
+aai.uRIBase=${aai_uri}
+aai.fromAppId=namegen-mS
diff --git a/ms/neng/src/main/docker/startService.sh b/ms/neng/src/main/docker/startService.sh
index 2e3e454c..17f53ce5 100644
--- a/ms/neng/src/main/docker/startService.sh
+++ b/ms/neng/src/main/docker/startService.sh
@@ -19,11 +19,18 @@
touch /app.jar
APP_ARGS=-Dspring.profiles.active=${SPRING_PROFILE}
-APP_ARGS=${APP_ARGS}" -Dpolicymgr_url="${POLICYMGR_URL}" -Dinstar_aaf_enc_pass="${AAF_PASS_ENC}
-APP_ARGS=${APP_ARGS}" -Daai_cert_pass="${AAI_CERT_PASSWORD}" -Daai_uribase="${AAI_URI_BASE}
-APP_ARGS=${APP_ARGS}" -Dneng_db_user="${NENG_DB_USER}" -Dneng_db_pass="${NENG_DB_PASS}
-APP_ARGS=${APP_ARGS}" -Dneng_db_url="${NENG_DB_URL}
+APP_ARGS=${APP_ARGS}" -Dneng_db_user="${NENG_DB_USER}" -Dneng_db_pass="${NENG_DB_PASS}
+APP_ARGS=${APP_ARGS}" -Dneng_db_url="${NENG_DB_URL}
+APP_ARGS=${APP_ARGS}" -Dpol_client_auth="${POL_CLIENT_AUTH}
+APP_ARGS=${APP_ARGS}" -Dpol_basic_auth="${POL_BASIC_AUTH}
+APP_ARGS=${APP_ARGS}" -Dpol_url="${POL_URL}
+APP_ARGS=${APP_ARGS}" -Dpol_env="${POL_ENV}
+APP_ARGS=${APP_ARGS}" -Dpol_req_id="${POL_REQ_ID}
+APP_ARGS=${APP_ARGS}" -Daai_cert_pass="${AAI_CERT_PASS}
+APP_ARGS=${APP_ARGS}" -Daai_cert_path="${AAI_CERT_PATH}
+APP_ARGS=${APP_ARGS}" -Daai_uri="${AAI_URI}
APP_ARGS=${APP_ARGS}" -cp /opt/etc/config"
echo "APP_ARGS ="${APP_ARGS}
java -Djava.security.egd=file:/dev/./urandom ${APP_ARGS} -Xms1024m -Xmx1024m -jar /app.jar --spring.config.location=/opt/etc/config/ > /tmp/app.out 2> /tmp/app.err
+
diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/PolicyFinderServiceImpl.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/PolicyFinderServiceImpl.java
index 392567b7..e93675bf 100644
--- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/PolicyFinderServiceImpl.java
+++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/service/extinf/impl/PolicyFinderServiceImpl.java
@@ -27,7 +27,9 @@ import java.security.cert.X509Certificate;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
+import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.conn.ssl.TrustStrategy;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -142,7 +144,8 @@ public class PolicyFinderServiceImpl implements PolicyFinder {
TrustStrategy acceptingTrustStrategy = (X509Certificate[] chain, String authType) -> true;
SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom()
.loadTrustMaterial(null, acceptingTrustStrategy).build();
- SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
+ HostnameVerifier verifier = (String arg0, SSLSession arg1) -> true;
+ SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext, verifier);
CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(csf).build();
HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
requestFactory.setHttpClient(httpClient);
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/AaiResponseTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/AaiResponseTest.java
new file mode 100644
index 00000000..81279b9d
--- /dev/null
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/resource/model/AaiResponseTest.java
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 IBM.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.apps.ms.neng.core.resource.model;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AaiResponseTest {
+ private AaiResponse aai;
+
+ @Before
+ public void setup() {
+ aai = new AaiResponse();
+ }
+
+ @Test
+ public void isRecFound() {
+ aai.setRecFound(true);
+ assertEquals(true, aai.isRecFound());
+ }
+
+}
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceTest.java
index 7ea63e61..22063a4d 100644
--- a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceTest.java
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/service/SpringServiceTest.java
@@ -109,6 +109,11 @@ public class SpringServiceTest {
Assert.assertNotNull(springserviceImpl.releaseNetworkElementName(request));
}
+ @Test(expected=Exception.class)
+ public void releaseNetworkElementNameTestForNull() throws Exception {
+ springserviceImpl.releaseNetworkElementName(null);
+ }
+
@Test
public void testGetQuickHello() {
Assert.assertTrue(springserviceImpl.getQuickHello("testMessage") instanceof HelloWorld);
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/GeneratedNameTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/GeneratedNameTest.java
new file mode 100644
index 00000000..7965b7a4
--- /dev/null
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/GeneratedNameTest.java
@@ -0,0 +1,90 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 IBM.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.ccsdk.apps.ms.neng.persistence.entity;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class GeneratedNameTest {
+ private GeneratedName generatedName;
+
+ @Before
+ public void setUp() {
+ generatedName = new GeneratedName();
+ }
+
+ @Test
+ public void testGetSetGeneratedNameId() {
+ generatedName.setGeneratedNameId(1);
+ Integer expected = 1;
+ Assert.assertEquals(expected, generatedName.getGeneratedNameId());
+ }
+
+ @Test
+ public void testGetSetSequenceNumber() {
+ generatedName.setSequenceNumber(2121314312321L);
+ Long expected = 2121314312321L;
+ Assert.assertEquals(expected, generatedName.getSequenceNumber());
+ }
+
+ @Test
+ public void testGetSetSequenceNumberEnc() {
+ generatedName.setSequenceNumberEnc("TestSequenceNumberEnc");
+ String expected = "TestSequenceNumberEnc";
+ Assert.assertEquals(expected, generatedName.getSequenceNumberEnc());
+ }
+
+ @Test
+ public void testGetSetElementType() {
+ generatedName.setElementType("TestElementType");
+ String expected = "TestElementType";
+ Assert.assertEquals(expected, generatedName.getElementType());
+ }
+
+ @Test
+ public void testGetSetName() {
+ generatedName.setName("TestName");
+ String expected = "TestName";
+ Assert.assertEquals(expected, generatedName.getName());
+ }
+
+ @Test
+ public void testGetSetPrefix() {
+ generatedName.setPrefix("TestPrefix");
+ String expected = "TestPrefix";
+ Assert.assertEquals(expected, generatedName.getPrefix());
+ }
+
+ @Test
+ public void testGetSetSuffix() {
+ generatedName.setSuffix("TestSuffix");
+ String expected = "TestSuffix";
+ Assert.assertEquals(expected, generatedName.getSuffix());
+ }
+
+ @Test
+ public void testGetSetIsReleased() {
+ generatedName.setIsReleased("TestIsReleased");
+ String expected = "TestIsReleased";
+ Assert.assertEquals(expected, generatedName.getIsReleased());
+ }
+
+}
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/IdentifierMapTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/IdentifierMapTest.java
new file mode 100644
index 00000000..dc510429
--- /dev/null
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/IdentifierMapTest.java
@@ -0,0 +1,98 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 IBM.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.apps.ms.neng.persistence.entity;
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class IdentifierMapTest {
+ private IdentifierMap identifierMap;
+
+ @Before
+ public void setUp() {
+ identifierMap = new IdentifierMap();
+ }
+
+ @Test
+ public void testGetSetIdentifierMapId() {
+ identifierMap.setIdentifierMapId(1);
+ Integer expected = 1;
+ Assert.assertEquals(expected, identifierMap.getIdentifierMapId());
+ }
+
+ @Test
+ public void testGetSetPolicyFnName() {
+ identifierMap.setPolicyFnName("PolicyFnName");
+ String expected = "PolicyFnName";
+ Assert.assertEquals(expected, identifierMap.getPolicyFnName());
+ }
+
+ @Test
+ public void testGetSetJsFnName() {
+ identifierMap.setJsFnName("JsFnName");
+ String expected = "JsFnName";
+ Assert.assertEquals(expected, identifierMap.getJsFnName());
+ }
+
+ @Test
+ public void testGetSetCreatedTime() throws ParseException {
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ Date date = dateFormat.parse("23/09/2007");
+ long time = date.getTime();
+ Timestamp timeStamp = new Timestamp(time);
+ identifierMap.setCreatedTime(timeStamp);
+ Timestamp expected = timeStamp;
+ Assert.assertEquals(expected, identifierMap.getCreatedTime());
+ }
+
+ @Test
+ public void testGetSetCreatedBy() {
+ identifierMap.setCreatedBy("Name");
+ String expected = "Name";
+ Assert.assertEquals(expected, identifierMap.getCreatedBy());
+ }
+
+ @Test
+ public void testGetSetLastUpdatedTime() throws ParseException {
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ Date date = dateFormat.parse("23/09/2007");
+ long time = date.getTime();
+ Timestamp timeStamp = new Timestamp(time);
+ identifierMap.setLastUpdatedTime(timeStamp);
+ Timestamp expected = timeStamp;
+ Assert.assertEquals(expected, identifierMap.getLastUpdatedTime());
+ }
+
+ @Test
+ public void testGetSetLastUpdatedBy() {
+ identifierMap.setLastUpdatedBy("Name");
+ String expected = "Name";
+ Assert.assertEquals(expected, identifierMap.getLastUpdatedBy());
+ }
+
+}
diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/PolicyDetailsTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/PolicyDetailsTest.java
new file mode 100644
index 00000000..70508684
--- /dev/null
+++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/persistence/entity/PolicyDetailsTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK.apps
+ * ================================================================================
+ * Copyright (C) 2018 IBM.
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.apps.ms.neng.persistence.entity;
+
+
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class PolicyDetailsTest {
+ private PolicyDetails policyDetails;
+
+ @Before
+ public void setUp() {
+ policyDetails = new PolicyDetails();
+ }
+
+ @Test
+ public void testGetSetPolicyId() {
+ policyDetails.setPolicyId(1);
+ Integer expected = 1;
+ Assert.assertEquals(expected, policyDetails.getPolicyId());
+ }
+
+ @Test
+ public void testGetSetPolicyName() {
+ policyDetails.setPolicyName("PolicyName");
+ String expected = "PolicyName";
+ Assert.assertEquals(expected, policyDetails.getPolicyName());
+ }
+
+ @Test
+ public void testGetSetPolicyResponse() {
+ policyDetails.setPolicyResponse("PolicyResponse");
+ String expected = "PolicyResponse";
+ Assert.assertEquals(expected, policyDetails.getPolicyResponse());
+ }
+
+ @Test
+ public void testGetSetCreatedTime() throws ParseException {
+ DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+ Date date = dateFormat.parse("23/09/2007");
+ long time = date.getTime();
+ Timestamp timeStamp = new Timestamp(time);
+ policyDetails.setCreatedTime(timeStamp);
+ String expected = "PolicyResponse";
+ Assert.assertEquals(timeStamp, policyDetails.getCreatedTime());
+ }
+
+
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestInputTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestInputTest.java
new file mode 100644
index 00000000..057e6721
--- /dev/null
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestInputTest.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright © 2018 IBM.
+ *
+ * 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.ccsdk.apps.ms.vlangtagapi.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.AssignVlanTagRequestInput;
+
+public class AssignVlanTagRequestInputTest {
+
+ private AssignVlanTagRequestInput assignVlanTagRequestInput;
+
+ private AssignVlanTagRequestInput assignVlanTagRequestInput1;
+
+ @Before
+ public void setUp()
+ {
+ assignVlanTagRequestInput = new AssignVlanTagRequestInput();
+ assignVlanTagRequestInput1= new AssignVlanTagRequestInput();
+ assignVlanTagRequestInput.setPolicyInstanceName("policyInstanceName");
+ assignVlanTagRequestInput.setResourceName("resourceName");
+ assignVlanTagRequestInput.setResourceValue("resourceValue");
+ assignVlanTagRequestInput.setScopeId("scopeId");
+ assignVlanTagRequestInput.setVlanTagKey("vlanTagKey");
+ assignVlanTagRequestInput.setVlanType("vlanType");
+
+ assignVlanTagRequestInput1.setPolicyInstanceName("policyInstanceName");
+ assignVlanTagRequestInput1.setResourceName("resourceName");
+ assignVlanTagRequestInput1.setResourceValue("resourceValue");
+ assignVlanTagRequestInput1.setScopeId("scopeId");
+ assignVlanTagRequestInput1.setVlanTagKey("vlanTagKey");
+ assignVlanTagRequestInput1.setVlanType("vlanType");
+ }
+
+ @Test
+ public void testPolicyInstanceName()
+ {
+ assignVlanTagRequestInput.policyInstanceName("testPolicyInstanceName");
+ assertEquals("testPolicyInstanceName", assignVlanTagRequestInput.getPolicyInstanceName());
+ }
+
+ @Test
+ public void testResourceName()
+ {
+ assignVlanTagRequestInput.resourceName("testResourceName");
+ assertEquals("testResourceName", assignVlanTagRequestInput.getResourceName());
+ }
+
+ @Test
+ public void testResourceValue()
+ {
+ assignVlanTagRequestInput.resourceValue("testResourceValue");
+ assertEquals("testResourceValue", assignVlanTagRequestInput.getResourceValue());
+ }
+
+ @Test
+ public void testScopeId()
+ {
+ assignVlanTagRequestInput.scopeId("testScopeId");
+ assertEquals("testScopeId", assignVlanTagRequestInput.getScopeId());
+ }
+
+ @Test
+ public void testVlanTagKey()
+ {
+ assignVlanTagRequestInput.vlanTagKey("testVlanTagKey");
+ assertEquals("testVlanTagKey", assignVlanTagRequestInput.getVlanTagKey());
+ }
+
+ @Test
+ public void testVlanType()
+ {
+ assignVlanTagRequestInput.vlanType("testVlanType");
+ assertEquals("testVlanType", assignVlanTagRequestInput.getVlanType());
+ }
+
+ @Test
+ public void testEquals()
+ {
+ assertEquals(true, assignVlanTagRequestInput.equals(assignVlanTagRequestInput1));
+ }
+
+ @Test
+ public void testToStringAndHashcode()
+ {
+ assertTrue(assignVlanTagRequestInput.toString() instanceof String);
+ assertTrue((Integer)assignVlanTagRequestInput.hashCode() instanceof Integer);
+ }
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestTest.java
new file mode 100644
index 00000000..5d18560f
--- /dev/null
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagRequestTest.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright © 2018 IBM.
+ *
+ * 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.ccsdk.apps.ms.vlangtagapi.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.AssignVlanTagRequest;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.AssignVlanTagRequestInput;
+
+public class AssignVlanTagRequestTest {
+
+ private AssignVlanTagRequest assignVlanTagRequest;
+ private AssignVlanTagRequest assignVlanTagRequest1;
+ private List<AssignVlanTagRequestInput> input;
+
+ @Before
+ public void setUp()
+ {
+ assignVlanTagRequest = new AssignVlanTagRequest();
+ assignVlanTagRequest1 = new AssignVlanTagRequest();
+ input= new ArrayList<>();
+ }
+
+ @Test
+ public void testGetSetOutput()
+ {
+ assignVlanTagRequest.setInput(input);
+ assignVlanTagRequest.input(assignVlanTagRequest.getInput());
+ assertEquals(input, assignVlanTagRequest.getInput());
+ }
+
+ @Test
+ public void testEquals()
+ {
+ assignVlanTagRequest.setInput(input);
+ assignVlanTagRequest1.setInput(input);
+ assertEquals(true, assignVlanTagRequest.equals(assignVlanTagRequest1));
+ }
+
+ @Test
+ public void testToStringAndHashCode()
+ {
+ assertTrue(assignVlanTagRequest.toString() instanceof String);
+ assertTrue((Integer)assignVlanTagRequest.hashCode() instanceof Integer);
+ }
+
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseOutputTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseOutputTest.java
new file mode 100644
index 00000000..3cfed1d2
--- /dev/null
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseOutputTest.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ *
+ * 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.ccsdk.apps.ms.vlangtagapi.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.AssignVlanTagResponseOutput;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.VlanTag;
+
+public class AssignVlanTagResponseOutputTest {
+
+ private AssignVlanTagResponseOutput assignVlanTagResponseOutput;
+ private AssignVlanTagResponseOutput assignVlanTagResponseOutput1;
+
+ @Before
+ public void setUp()
+ {
+ assignVlanTagResponseOutput= new AssignVlanTagResponseOutput();
+ assignVlanTagResponseOutput1= new AssignVlanTagResponseOutput();
+ }
+
+ @Test
+ public void testResourceName()
+ {
+ assignVlanTagResponseOutput.resourceName("resourceName");
+ assertEquals("resourceName", assignVlanTagResponseOutput.getResourceName());
+ }
+
+ @Test
+ public void testResourceValue()
+ {
+ assignVlanTagResponseOutput.resourceValue("resourceValue");
+ assertEquals("resourceValue", assignVlanTagResponseOutput.getResourceValue());
+ }
+
+ @Test
+ public void testResourceVlanRole()
+ {
+ assignVlanTagResponseOutput.resourceVlanRole("resourceVlanRole");
+ assertEquals("resourceVlanRole", assignVlanTagResponseOutput.getResourceVlanRole());
+ }
+
+ @Test
+ public void testStoredElements()
+ {
+ List<VlanTag> storedElements = new ArrayList<>();
+ assignVlanTagResponseOutput.storedElements(storedElements);
+ assertEquals(storedElements, assignVlanTagResponseOutput.getStoredElements());
+ }
+
+ @Test
+ public void testEqualsAndHashCode()
+ {
+ assertTrue(assignVlanTagResponseOutput.equals(assignVlanTagResponseOutput1));
+ assertTrue((Integer)assignVlanTagResponseOutput.hashCode() instanceof Integer);
+ }
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseTest.java
new file mode 100644
index 00000000..bbcebbad
--- /dev/null
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseTest.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright © 2018 IBM.
+ *
+ * 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.ccsdk.apps.ms.vlangtagapi.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.AssignVlanTagResponse;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.AssignVlanTagResponseOutput;;
+
+public class AssignVlanTagResponseTest {
+ private AssignVlanTagResponse assignVlanTagResponse;
+
+ private AssignVlanTagResponse assignVlanTagResponse1;
+
+ @Before
+ public void setUp()
+ {
+ assignVlanTagResponse= new AssignVlanTagResponse();
+ assignVlanTagResponse1= new AssignVlanTagResponse();
+ }
+
+ @Test
+ public void testOutput()
+ {
+ List<AssignVlanTagResponseOutput> output=new ArrayList<AssignVlanTagResponseOutput>();
+ assignVlanTagResponse.output(output);
+ assertEquals(output, assignVlanTagResponse.getOutput());
+ }
+
+ @Test
+ public void testErrorCode()
+ {
+ assignVlanTagResponse.errorCode(200);
+ Integer expected=200;
+ assertEquals(expected, assignVlanTagResponse.getErrorCode());
+ }
+
+ @Test
+ public void testEqualsAndHashcode()
+ {
+ assertTrue(assignVlanTagResponse.equals(assignVlanTagResponse1));
+ assertTrue((Integer)assignVlanTagResponse.hashCode() instanceof Integer);
+ }
+
+
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestInputTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestInputTest.java
new file mode 100644
index 00000000..6081d0b4
--- /dev/null
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestInputTest.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright © 2018 IBM.
+ *
+ * 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.ccsdk.apps.ms.vlangtagapi.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.UnassignVlanTagRequestInput;
+
+public class UnassignVlanTagRequestInputTest {
+
+ private UnassignVlanTagRequestInput unassignVlanTagRequestInput;
+ private UnassignVlanTagRequestInput unassignVlanTagRequestInput1;
+
+ @Before
+ public void setUp()
+ {
+ unassignVlanTagRequestInput= new UnassignVlanTagRequestInput();
+ unassignVlanTagRequestInput1= new UnassignVlanTagRequestInput();
+ }
+
+ @Test
+ public void testPolicyInstanceName()
+ {
+ unassignVlanTagRequestInput.policyInstanceName("policyInstanceName");
+ assertEquals("policyInstanceName", unassignVlanTagRequestInput.getPolicyInstanceName());
+ }
+
+ @Test
+ public void testVlanType()
+ {
+ unassignVlanTagRequestInput.vlanType("vlanType");
+ assertEquals("vlanType", unassignVlanTagRequestInput.getVlanType());
+ }
+
+ @Test
+ public void testEquals()
+ {
+ assertTrue(unassignVlanTagRequestInput.equals(unassignVlanTagRequestInput1));
+
+ }
+
+ @Test
+ public void testToStringAndHashCode()
+ {
+ assertTrue(unassignVlanTagRequestInput.toString() instanceof String);
+ assertTrue((Integer)unassignVlanTagRequestInput.hashCode() instanceof Integer);
+
+ }
+
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestTest.java
new file mode 100644
index 00000000..65394c88
--- /dev/null
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestTest.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright © 2018 IBM.
+ *
+ * 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.ccsdk.apps.ms.vlangtagapi.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.UnassignVlanTagRequest;
+import org.onap.ccsdk.apps.ms.vlantagapi.core.model.UnassignVlanTagRequestInput;
+
+public class UnassignVlanTagRequestTest {
+
+ private UnassignVlanTagRequest unassignVlanTagRequest;
+ private UnassignVlanTagRequest unassignVlanTagRequest1;
+
+ @Before
+ public void setUp()
+ {
+ unassignVlanTagRequest= new UnassignVlanTagRequest();
+ unassignVlanTagRequest1= new UnassignVlanTagRequest();
+ }
+
+ @Test
+ public void testInput()
+ {
+ List<UnassignVlanTagRequestInput> input = new ArrayList<>();
+ unassignVlanTagRequest.input(input);
+ assertEquals(input, unassignVlanTagRequest.getInput());
+ }
+
+ @Test
+ public void testEquals()
+ {
+ assertTrue(unassignVlanTagRequest.equals(unassignVlanTagRequest1));
+ }
+
+ @Test
+ public void testToStringAndHashcode()
+ {
+ assertTrue(unassignVlanTagRequest.toString() instanceof String);
+ assertTrue((Integer)unassignVlanTagRequest.hashCode() instanceof Integer);
+ }
+
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java
index 4655d3d1..18aa3024 100644
--- a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java
+++ b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/TestVlantagApiServiceImpl.java
@@ -1,5 +1,6 @@
/*******************************************************************************
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +17,7 @@
package org.onap.ccsdk.apps.ms.vlantagapi.core.service;
+import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import java.util.ArrayList;
import java.util.List;
@@ -82,6 +84,22 @@ private static final Logger log = LoggerFactory.getLogger(TestVlantagApiServiceI
Mockito.doReturn(peResponses).when(policyEngineSpy).getConfigUsingPost(any());
}
+ @Test
+ public void testAssignVlanTagForNullRequest() throws Exception
+ {
+ AssignVlanTagResponse response = service.assignVlanTag(null);
+ Integer expectedErrorCode=500;
+ assertEquals(expectedErrorCode, response.getErrorCode());
+ }
+
+ @Test
+ public void testUnAssignVlanTagForNullRequest() throws Exception
+ {
+ UnassignVlanTagResponse response = service.unassignVlanTag(null);
+ Integer expectedErrorCode=500;
+ assertEquals(expectedErrorCode, response.getErrorCode());
+ }
+
@Test(expected = Test.None.class /* no exception expected */)
public void test_assign_sucess_001() throws Exception {