Merge "Enable blueprintprocessor and vlantag-api"
authorDan Timoney <dtimoney@att.com>
Wed, 28 Nov 2018 21:33:16 +0000 (21:33 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 28 Nov 2018 21:33:16 +0000 (21:33 +0000)
components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ModelTypeRest.java
ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/AssignVlanTagResponseTest.java
ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlangtagapi/core/model/UnassignVlanTagRequestInputTest.java
ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/ElementsTest.java [new file with mode: 0644]
ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/PolicyConfigTest.java [new file with mode: 0644]
ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/PolicyContentTest.java [new file with mode: 0644]
ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/RequestObjectTest.java [new file with mode: 0644]
ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/ResourceModelTest.java [new file with mode: 0644]

index 0faf09c..f7947ef 100644 (file)
@@ -30,7 +30,7 @@
     },
     {
       "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_net_id}_sub"
+      "param-value": "${onap_private_subnet_id}"
     }
   ],
   "capability-data": [
index 988cad0..0f485a0 100644 (file)
@@ -44,18 +44,18 @@ public class ModelTypeRest {
     }\r
 \r
     @GetMapping(path = "/{name}", produces = MediaType.APPLICATION_JSON_VALUE)\r
-    public ModelType getModelTypeByName(@PathVariable(value = "name") String name) throws BluePrintException {\r
+    public ModelType getModelTypeByName(@PathVariable(value = "name") String name) {\r
         return modelTypeService.getModelTypeByName(name);\r
     }\r
 \r
     @GetMapping(path = "/search/{tags}", produces = MediaType.APPLICATION_JSON_VALUE)\r
-    public List<ModelType> searchModelTypes(@PathVariable(value = "tags") String tags) throws BluePrintException {\r
+    public List<ModelType> searchModelTypes(@PathVariable(value = "tags") String tags) {\r
         return modelTypeService.searchModelTypes(tags);\r
     }\r
 \r
     @GetMapping(path = "/by-definition/{definitionType}", produces = MediaType.APPLICATION_JSON_VALUE)\r
     public @ResponseBody\r
-    List<ModelType> getModelTypeByDefinitionType(@PathVariable(value = "definitionType") String definitionType) throws BluePrintException {\r
+    List<ModelType> getModelTypeByDefinitionType(@PathVariable(value = "definitionType") String definitionType) {\r
         return modelTypeService.getModelTypeByDefinitionType(definitionType);\r
     }\r
 \r
@@ -66,7 +66,7 @@ public class ModelTypeRest {
     }\r
 \r
     @DeleteMapping(path = "/{name}")\r
-    public void deleteModelTypeByName(@PathVariable(value = "name") String name) throws BluePrintException {\r
+    public void deleteModelTypeByName(@PathVariable(value = "name") String name) {\r
         modelTypeService.deleteByModelName(name);\r
     }\r
 }\r
index bbcebba..30f817e 100644 (file)
@@ -62,5 +62,12 @@ public class AssignVlanTagResponseTest {
         assertTrue((Integer)assignVlanTagResponse.hashCode() instanceof Integer);
     }
     
+    @Test
+    public void testErrorMessage()
+    {
+       assignVlanTagResponse.errorMessage("test error message");
+       assertEquals("test error message",assignVlanTagResponse.getErrorMessage());
+    }
+    
    
 }
index 6081d0b..99498d6 100644 (file)
@@ -64,4 +64,12 @@ public class UnassignVlanTagRequestInputTest {
         
     }
     
+    @Test
+    public void testVlanTagKey()
+    {
+       unassignVlanTagRequestInput.vlanTagKey("testVlanTagKey");
+        assertEquals("testVlanTagKey",unassignVlanTagRequestInput.getVlanTagKey());
+        
+    }
+    
 }
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/ElementsTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/ElementsTest.java
new file mode 100644 (file)
index 0000000..6d534ff
--- /dev/null
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * 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.vlantagapi.core.extinf.pm.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ElementsTest {
+       private Elements elements;
+
+       @Before
+       public void setUp() {
+               elements = new Elements();
+       }
+
+       @Test
+       public void testGetSetRecycleVlantagRange() {
+               elements.setRecycleVlantagRange("recycleVlantagRange");
+               assertEquals("recycleVlantagRange", elements.getRecycleVlantagRange());
+       }
+
+       @Test
+       public void testGetSetOverwrite() {
+               elements.setOverwrite("overwrite");
+               assertEquals("overwrite", elements.getOverwrite());
+       }
+
+       @Test
+       public void testGetSetElementVlanRole() {
+               elements.setElementVlanRole("elementVlanRole");
+               assertEquals("elementVlanRole", elements.getElementVlanRole());
+       }
+
+       @Test
+       public void testToString() {
+               assertTrue(elements.toString() instanceof String);
+       }
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/PolicyConfigTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/PolicyConfigTest.java
new file mode 100644 (file)
index 0000000..cf928ce
--- /dev/null
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * 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.vlantagapi.core.extinf.pm.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class PolicyConfigTest {
+
+    private PolicyConfig policyConfig;
+
+    @Before
+    public void setUp() {
+        policyConfig = new PolicyConfig();
+    }
+
+    @Test
+    public void testGetSetConfigName() {
+        policyConfig.setConfigName("configName");
+        assertEquals("configName", policyConfig.getConfigName());
+    }
+
+    @Test
+    public void testGetSetRiskLevel() {
+        policyConfig.setRiskLevel("RiskLevel");
+        assertEquals("RiskLevel", policyConfig.getRiskLevel());
+    }
+
+    @Test
+    public void testGetSetPolicyName() {
+        policyConfig.setPolicyName("PolicyName");
+        assertEquals("PolicyName", policyConfig.getPolicyName());
+    }
+
+    @Test
+    public void testGetSetPolicyScope() {
+        policyConfig.setPolicyScope("PolicyScope");
+        assertEquals("PolicyScope", policyConfig.getPolicyScope());
+    }
+
+    @Test
+    public void testGetSetGuard() {
+        policyConfig.setGuard("Guard");
+        assertEquals("Guard", policyConfig.getGuard());
+    }
+    
+    @Test
+    public void testGetSetDescription() {
+        policyConfig.setDescription("Description");
+        assertEquals("Description", policyConfig.getDescription());
+    }
+    
+    @Test
+    public void testGetSetPriority() {
+        policyConfig.setPriority("Priority");
+        assertEquals("Priority", policyConfig.getPriority());
+    }
+    
+    @Test
+    public void testGetSetUuid() {
+        policyConfig.setUuid("Uuid");
+        assertEquals("Uuid", policyConfig.getUuid());
+    }
+    
+    @Test
+    public void testGetSetVersion() {
+        policyConfig.setVersion("Version");
+        assertEquals("Version", policyConfig.getVersion());
+    }
+    
+    @Test
+    public void testGetSetService() {
+        policyConfig.setService("Service");
+        assertEquals("Service", policyConfig.getService());
+    }
+     
+    @Test
+    public void testGetSetLocation() {
+        policyConfig.setLocation("Location");
+        assertEquals("Location", policyConfig.getLocation());
+    }
+    
+    @Test
+    public void testGetSetTemplateVersion() {
+        policyConfig.setTemplateVersion("TemplateVersion");
+        assertEquals("TemplateVersion", policyConfig.getTemplateVersion());
+    }
+    
+    @Test
+    public void testToString()
+    {
+        assertTrue(policyConfig.toString() instanceof String);
+    }
+
+}
\ No newline at end of file
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/PolicyContentTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/PolicyContentTest.java
new file mode 100644 (file)
index 0000000..a020723
--- /dev/null
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * 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.vlantagapi.core.extinf.pm.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class PolicyContentTest {
+
+    public PolicyContent policyContent;
+
+    @Before
+    public void setUp() {
+        policyContent = new PolicyContent();
+    }
+
+    @Test
+    public void testGetSetPolicyInstanceName() {
+        policyContent.setPolicyInstanceName("policyInstanceName");
+        assertEquals("policyInstanceName", policyContent.getPolicyInstanceName());
+    }
+    
+    @Test
+    public void testToString()
+    {
+        assertTrue(policyContent.toString() instanceof String);
+    }
+
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/RequestObjectTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/RequestObjectTest.java
new file mode 100644 (file)
index 0000000..1bc869e
--- /dev/null
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * 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.vlantagapi.core.extinf.pm.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class RequestObjectTest {
+    public RequestObject requestObject;
+
+    @Before
+    public void setUp() {
+        requestObject = new RequestObject();
+    }
+
+    @Test
+    public void testGetSetPolicyName() {
+        requestObject.setPolicyName("PolicyName");
+        assertEquals("PolicyName", requestObject.getPolicyName());
+    }
+
+    @Test
+    public void testToString() {
+        assertTrue(requestObject.toString() instanceof String);
+    }
+}
diff --git a/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/ResourceModelTest.java b/ms/vlantag-api/src/test/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/ResourceModelTest.java
new file mode 100644 (file)
index 0000000..faff693
--- /dev/null
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * 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.vlantagapi.core.extinf.pm.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ResourceModelTest {
+   private ResourceModel resourceModel;
+   
+   @Before
+   public void setUp()
+   {
+       resourceModel= new ResourceModel();
+   }
+   
+   @Test
+   public void testGetSetResourceName() {
+       resourceModel.setResourceName("ResourceName");
+       assertEquals("ResourceName", resourceModel.getResourceName());
+   }
+   
+   @Test
+   public void testGetSetDataStoreObject() {
+       resourceModel.setDataStoreObject("DataStoreObject");
+       assertEquals("DataStoreObject", resourceModel.getDataStoreObject());
+   }
+   
+   @Test
+   public void testGetSetKeyType() {
+       resourceModel.setKeyType("keyType");
+       assertEquals("keyType", resourceModel.getKeyType());
+   }
+   
+   @Test
+   public void testToString() {
+       assertTrue(resourceModel.toString() instanceof String);
+   }
+}