diff options
7 files changed, 277 insertions, 2 deletions
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 610d7ed6..3f90e0af 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -115,7 +115,7 @@ </profile> <profile> - <id>docker</id> + <id>dockerTBD</id> <build> <plugins> <plugin> @@ -134,7 +134,7 @@ </executions> <configuration> <imageName>${docker.registry}/onap/ccsdk-apps-ms-neng:${project.version}</imageName> - <dockerDirectory>src/main/docker</dockerDirectory> + <dockerDirectory>${basedir}/target/docker</dockerDirectory> <serverId>docker-hub</serverId> <registryUrl>https://${docker.registry}</registryUrl> <imageTags> @@ -552,6 +552,14 @@ </plugins> <resources> <resource> + <directory>src/main/docker</directory> + <targetPath>../docker</targetPath> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + <resource> <directory>src/main/resources</directory> <filtering>true</filtering> <includes> diff --git a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyPropertyMethodUtilsTest.java b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyPropertyMethodUtilsTest.java index f527b38b..f54e680e 100644 --- a/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyPropertyMethodUtilsTest.java +++ b/ms/neng/src/test/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicyPropertyMethodUtilsTest.java @@ -4,6 +4,8 @@ * ================================================================================ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications 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 @@ -21,6 +23,7 @@ package org.onap.ccsdk.apps.ms.neng.core.policy; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -34,5 +37,7 @@ public class PolicyPropertyMethodUtilsTest { assertEquals("TRLAKDG", PolicyPropertyMethodUtils.substring("TRLAKDG", "-11")); assertEquals("XYSZ1NNN", PolicyPropertyMethodUtils.toUpperCase("XySz1NNN")); assertEquals("xysz1nnn", PolicyPropertyMethodUtils.toLowerCase("XySz1NNN")); + assertTrue(PolicyPropertyMethodUtils.genUuid() instanceof String); + assertTrue(PolicyPropertyMethodUtils.getIsoDateString() instanceof String); } } 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/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/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/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 {
|