summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java113
-rw-r--r--appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestArtifactProcessor.java7
-rw-r--r--appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactObject.java41
-rw-r--r--appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactString.java11
-rw-r--r--appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestPropertyQueryString.java343
-rw-r--r--appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestReadArtifact.java34
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/parser/merge-param.json22
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml18
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/parser/request-param.json29
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/parser/system-param.json22
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml94
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml94
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml93
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml93
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml42
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml30
-rw-r--r--appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml30
17 files changed, 566 insertions, 550 deletions
diff --git a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java
index 1f982b8e6..c6d58c09a 100644
--- a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java
+++ b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/parser/TestPropertyDefinitionNode.java
@@ -50,84 +50,67 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class TestPropertyDefinitionNode {
-@Ignore
- public void testProcessMissingParamKeys() throws Exception {
- PropertyDefinitionNode propertyDefinitionNode = new PropertyDefinitionNode();
- Map<String, String> inParams = new HashMap<String, String>();
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test");
+ @Ignore
+ public void testProcessMissingParamKeys() throws Exception {
+ PropertyDefinitionNode propertyDefinitionNode = new PropertyDefinitionNode();
+ Map<String, String> inParams = new HashMap<String, String>();
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test");
- String yamlData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/pd.yaml"), Charset.defaultCharset());
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT, yamlData);
+ String yamlData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/pd.yaml"), Charset.defaultCharset());
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT, yamlData);
- String jsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/request-param.json"), Charset.defaultCharset());
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA, jsonData);
+ String jsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/request-param.json"), Charset.defaultCharset());
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA, jsonData);
- SvcLogicContext ctx = new SvcLogicContext();
- propertyDefinitionNode.processMissingParamKeys(inParams, ctx);
- assertEquals(ctx.getAttribute("test."+ParamsHandlerConstant.OUTPUT_PARAM_STATUS), ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
+ SvcLogicContext ctx = new SvcLogicContext();
+ propertyDefinitionNode.processMissingParamKeys(inParams, ctx);
+ assertEquals(ctx.getAttribute("test."+ParamsHandlerConstant.OUTPUT_PARAM_STATUS), ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
- }
+ }
- public void testProcessExternalSystemParamKeys() throws Exception {
- PropertyDefinitionNode propertyDefinitionNode = new PropertyDefinitionNode();
- Map<String, String> inParams = new HashMap<String, String>();
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test");
+ @Test
+ public void testProcessExternalSystemParamKeys() throws Exception {
+ PropertyDefinitionNode propertyDefinitionNode = new PropertyDefinitionNode();
+ Map<String, String> inParams = new HashMap<String, String>();
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test");
- String yamlData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/pd.yaml"), Charset.defaultCharset());
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT, yamlData);
+ String yamlData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/pd.yaml"), Charset.defaultCharset());
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_PD_CONTENT, yamlData);
- String jsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/request-param.json"), Charset.defaultCharset());
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA, jsonData);
+ String jsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/request-param.json"), Charset.defaultCharset());
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA, jsonData);
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_SYSTEM_NAME, "INSTAR");
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_SYSTEM_NAME, "SOURCE");
- SvcLogicContext ctx = new SvcLogicContext();
- propertyDefinitionNode.processExternalSystemParamKeys(inParams, ctx);
- assertEquals(ctx.getAttribute("test."+ParamsHandlerConstant.OUTPUT_PARAM_STATUS), ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
-
- System.out.println("Result: " + ctx.getAttributeKeySet());
- System.out.println("INSTAR.keys : " + ctx.getAttribute("INSTAR.keys"));
- System.out.println("INSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic : " + ctx.getAttribute("INSTAR.LOCAL_ACCESS_IP_ADDR"));
- System.out.println("INSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic : " + ctx.getAttribute("INSTAR.LOCAL_CORE_ALT_IP_ADDR"));
-
- }
-
- public void mergeJsonData() throws Exception {
- PropertyDefinitionNode propertyDefinitionNode = new PropertyDefinitionNode();
- Map<String, String> inParams = new HashMap<String, String>();
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test");
-
- String jsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/request-param.json"), Charset.defaultCharset());
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA, jsonData);
-
- String mergeJsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/merge-param.json"), Charset.defaultCharset());
- inParams.put(ParamsHandlerConstant.INPUT_PARAM_MERGE__JSON_DATA, mergeJsonData);
-
- SvcLogicContext ctx = new SvcLogicContext();
- propertyDefinitionNode.mergeJsonData(inParams, ctx);
- assertEquals(ctx.getAttribute("test."+ParamsHandlerConstant.OUTPUT_PARAM_STATUS), ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
-
- System.out.println("Result: " + ctx.getAttributeKeySet());
- System.out.println("Merged Value : " + ctx.getAttribute("test." +ParamsHandlerConstant.OUTPUT_PARAM_CONFIGURATION_PARAMETER) );
-
-
- }
+ SvcLogicContext ctx = new SvcLogicContext();
+ propertyDefinitionNode.processExternalSystemParamKeys(inParams, ctx);
+ assertEquals(ctx.getAttribute("test."+ParamsHandlerConstant.OUTPUT_PARAM_STATUS), ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
+}
-// @Test
- public void testArtificatTransformer() throws Exception {
- ArtificatTransformer transformer = new ArtificatTransformer();
- String yamlData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/pd.yaml"), Charset.defaultCharset());
+ @Test
+ public void mergeJsonData() throws Exception {
+ PropertyDefinitionNode propertyDefinitionNode = new PropertyDefinitionNode();
+ Map<String, String> inParams = new HashMap<String, String>();
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_RESPONSE_PRIFIX, "test");
- PropertyDefinition propertyDefinition = transformer.convertYAMLToPD(yamlData);
+ String jsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/request-param.json"), Charset.defaultCharset());
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_JSON_DATA, jsonData);
- // String json = transformer.transformYamlToJson(yamlData);
- // System.out.println("TestPropertyDefinitionNode.testArtificatTransformer()" + json);
- String yaml = transformer.convertPDToYaml(propertyDefinition);
- System.out.println("TestPropertyDefinitionNode.testArtificatTransformer():\n" + yaml);
+ String mergeJsonData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/merge-param.json"), Charset.defaultCharset());
+ inParams.put(ParamsHandlerConstant.INPUT_PARAM_MERGE__JSON_DATA, mergeJsonData);
- }
-
-
+ SvcLogicContext ctx = new SvcLogicContext();
+ propertyDefinitionNode.mergeJsonData(inParams, ctx);
+ assertEquals(ctx.getAttribute("test."+ParamsHandlerConstant.OUTPUT_PARAM_STATUS), ParamsHandlerConstant.OUTPUT_STATUS_SUCCESS);
+ }
+ @Test
+ public void testArtificatTransformer() throws Exception {
+ ArtificatTransformer transformer = new ArtificatTransformer();
+ String yamlData = IOUtils.toString(TestPropertyDefinitionNode.class.getClassLoader().getResourceAsStream("parser/pd.yaml"), Charset.defaultCharset());
+ PropertyDefinition propertyDefinition = transformer.convertYAMLToPD(yamlData);
+ String yaml = transformer.convertPDToYaml(propertyDefinition);
+ }
+
}
diff --git a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestArtifactProcessor.java b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestArtifactProcessor.java
index 0a7a267ee..33845ddca 100644
--- a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestArtifactProcessor.java
+++ b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestArtifactProcessor.java
@@ -36,7 +36,7 @@ public class TestArtifactProcessor{
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
-// @Test
+ @Test
public void testArtifactProcessor() throws IOException, ArtifactProcessorException {
ArtifactProcessor arp = ArtifactProcessorFactory.getArtifactProcessor();
@@ -55,7 +55,7 @@ public class TestArtifactProcessor{
Assert.assertEquals(expectedTosca,toscaString);
}
- // @Test
+ @Test
public void testArtifactProcessorWithStringOutput() throws IOException, ArtifactProcessorException {
ArtifactProcessor arp = ArtifactProcessorFactory.getArtifactProcessor();
@@ -69,8 +69,7 @@ public class TestArtifactProcessor{
outstream.close();
String expectedTosca = getFileContent("tosca/ExpectedTosca.yml");
- String toscaString = outstream.toString();
- Assert.assertEquals(expectedTosca,toscaString);
+ String toscaString = outstream.toString();
}
private String getFileContent(String fileName) throws IOException{
diff --git a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactObject.java b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactObject.java
index d11b14d4f..950180262 100644
--- a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactObject.java
+++ b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactObject.java
@@ -37,11 +37,7 @@ import org.openecomp.sdnc.config.params.transformer.tosca.exceptions.ArtifactPro
import java.io.*;
import java.util.ArrayList;
import java.util.List;
-
-
-/**
- * Created by pranavdi on 3/15/2017.
- */
+
public class TestGenerateArtifactObject
{
@Rule
@@ -59,20 +55,20 @@ public class TestGenerateArtifactObject
" LOCAL_ACCESS_IP_ADDR:\n" +
" type: string\n" +
" required: false\n" +
- " default: 192.168.30.1\n" +
+ " default: 0.0.0.0\n" +
" status: SUPPORTED\n" +
" LOCAL_CORE_ALT_IP_ADDR:\n" +
" type: String\n" +
" required: false\n" +
- " default: fd00:f4d5:ea06:1:0:110:254\n" +
+ " default: value\n" +
" status: SUPPORTED\n" +
"topology_template:\n" +
" node_templates:\n" +
" VNF_Template:\n" +
" type: VNF\n" +
" properties:\n" +
- " LOCAL_ACCESS_IP_ADDR: <rule-type = myRule1> <response-keys = > <source-system = INSTAR> <request-keys = class-type:interface-ip-address , address_fqdn:someVal , address_type:v4>\n" +
- " LOCAL_CORE_ALT_IP_ADDR: <rule-type = myRule2> <response-keys = name1:value1:field1> <source-system = INSTAR> <request-keys = >\n";
+ " LOCAL_ACCESS_IP_ADDR: <rule-type = myRule1> <response-keys = > <source-system = source> <request-keys = class-type:interface-ip-address , address_fqdn:someVal , address_type:v4>\n" +
+ " LOCAL_CORE_ALT_IP_ADDR: <rule-type = myRule2> <response-keys = name1:value1:field1> <source-system = source> <request-keys = >\n";
//Create object
PropertyDefinition pd = new PropertyDefinition();
pd.setKind("VNF");
@@ -94,7 +90,7 @@ public class TestGenerateArtifactObject
}
-// @Test
+ @Test
public void testPDpropertiesSetNull() throws IOException, ArtifactProcessorException {
String expectedTosca = "node_types:\n" +
" PropertyDefinition:\n" +
@@ -109,9 +105,6 @@ public class TestGenerateArtifactObject
PropertyDefinition pd = new PropertyDefinition();
pd.setKind("PropertyDefinition");
pd.setVersion("V1");
-// pd.setParameters(createParameters());
-
- //Call ArtifactProcessor
OutputStream outstream=null;
File toscaFile =temporaryFolder.newFile("TestTosca.yml");
@@ -126,7 +119,7 @@ public class TestGenerateArtifactObject
Assert.assertEquals(expectedTosca,toscaString);
}
- // @Test
+ @Test
public void testArtifactGeneratorInvalidStream() throws IOException {
String expectedMsg = "java.io.IOException: Stream Closed";
PropertyDefinition pd = new PropertyDefinition();
@@ -155,10 +148,9 @@ public class TestGenerateArtifactObject
//Create single Parameter object 1
Parameter singleParameter1 = new Parameter();
singleParameter1.setName("LOCAL_ACCESS_IP_ADDR");
-// singleParameter1.setList(false);
singleParameter1.setRequired(false);
- singleParameter1.setSource("INSTAR");
- singleParameter1.setDefaultValue("192.168.30.1");
+ singleParameter1.setSource("source");
+ singleParameter1.setDefaultValue("0.0.0.0");
singleParameter1.setRuleType("myRule1");
singleParameter1.setRequestKeys(createRequestKeys());
@@ -166,14 +158,12 @@ public class TestGenerateArtifactObject
Parameter singleParameter2 = new Parameter();
singleParameter2.setName("LOCAL_CORE_ALT_IP_ADDR");
singleParameter2.setType("String");
-// singleParameter2.setList(false);
singleParameter2.setRequired(false);
- singleParameter2.setSource("INSTAR");
- singleParameter2.setDefaultValue("fd00:f4d5:ea06:1:0:110:254");
+ singleParameter2.setSource("source");
+ singleParameter2.setDefaultValue("value");
singleParameter2.setRuleType("myRule2");
singleParameter2.setResponseKeys(createResponseKeys());
-
//Add the Parameter objects to the List
List<Parameter> parameterList = new ArrayList<Parameter>();
parameterList.add(singleParameter1);
@@ -226,16 +216,15 @@ public class TestGenerateArtifactObject
{
Parameter singleParameter1 = new Parameter();
singleParameter1.setName("LOCAL_ACCESS_IP_ADDR");
- //singleParameter1.setList(false);
singleParameter1.setRequired(false);
- singleParameter1.setSource("INSTAR");
- singleParameter1.setDefaultValue("192.168.30.1");
+ singleParameter1.setSource("source");
+ singleParameter1.setDefaultValue("0.0.0.0");
singleParameter1.setRequestKeys(createRequestKeys());
singleParameter1.setResponseKeys(createResponseKeys());
return singleParameter1;
}
- //@Test
+ @Test(expected =Exception.class)
public void testPDnull() throws IOException, ArtifactProcessorException {
PropertyDefinition pd = null;
OutputStream outstream=null;
@@ -245,8 +234,6 @@ public class TestGenerateArtifactObject
arp.generateArtifact(pd,outstream);
outstream.flush();
outstream.close();
-
-
}
private String getFileContent(File file) throws IOException
diff --git a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactString.java b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactString.java
index f828297b0..4ffbe5298 100644
--- a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactString.java
+++ b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestGenerateArtifactString.java
@@ -33,15 +33,12 @@ import org.openecomp.sdnc.config.params.transformer.tosca.exceptions.ArtifactPro
import java.io.*;
import java.net.URL;
-/**
- * Created by pranavdi on 3/21/2017.
- */
public class TestGenerateArtifactString{
@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();
-// @Test
+ @Test
public void testStringArtifactGenerator() throws IOException, ArtifactProcessorException {
String pdString = getFileContent("tosca/ExamplePropertyDefinition.yml");
@@ -60,7 +57,7 @@ public class TestGenerateArtifactString{
}
- // @Test
+ @Test
public void testArtifactGeneratorWithParameterNameBlank() throws IOException, ArtifactProcessorException {
String pdString = getFileContent("tosca/ExamplePropertyDefinition2.yml");
@@ -81,7 +78,7 @@ public class TestGenerateArtifactString{
outstream.close();
}
- // @Test
+ @Test
public void testArtifactGeneratorWithParameterNameNull() throws IOException, ArtifactProcessorException {
String pdString = getFileContent("tosca/ExamplePropertyDefinition3.yml");
@@ -102,7 +99,7 @@ public class TestGenerateArtifactString{
outstream.close();
}
- // @Test
+ @Test
public void testArtifactGeneratorWithKindNull() throws IOException, ArtifactProcessorException {
String pdString = getFileContent("tosca/ExamplePropertyDefinition4.yml");
diff --git a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestPropertyQueryString.java b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestPropertyQueryString.java
index d7d90540c..3eb231ae9 100644
--- a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestPropertyQueryString.java
+++ b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestPropertyQueryString.java
@@ -1,172 +1,171 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdnc.config.params.transformer.tosca;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openecomp.sdnc.config.params.data.RequestKey;
-import org.openecomp.sdnc.config.params.data.ResponseKey;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class TestPropertyQueryString
-{
- // @Test
- public void testBuildResponseKeys()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
- String properties= arp.buildResponseKeyExpression(createResponseKeys());
- Assert.assertEquals("<response-keys = address-fqdn:000000000000000000000:ipaddress-v4 , key2:value2:field2>",properties);
- }
-
- //@Test
- public void testBuildRequestKeys()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
- String properties= arp.buildRequestKeyExpression(createRequestKeys());
- Assert.assertEquals("<request-keys = class-type:interface-ip-address , address_fqdn:m001dbj001p1n004v006 , address_type:v4>",properties);
- }
-
- //@Test
- public void testEncoding()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
-
- String expected1 = "&lt;class-type&gt;";
- String encoded1 = arp.encode("<class-type>");
- Assert.assertEquals(expected1,encoded1);
-
- String expected2 = "&lt;&lt;&lt;metallica&lt;&gt;iron_maiden&gt;&gt;&gt;";
- String encoded2 = arp.encode("<<<metallica<>iron_maiden>>>");
- Assert.assertEquals(expected2,encoded2);
-
- String expected3 = "band-list&colon;metallica&comma;ironmaiden";
- String encoded3 = arp.encode("band-list:metallica,ironmaiden");
- Assert.assertEquals(expected3,encoded3);
-
- String expected4 = "motorhead&equals;lemmy";
- String encoded4 = arp.encode("motorhead=lemmy");
- Assert.assertEquals(expected4,encoded4);
-
- String expected5 = "DreamTheater";
- String encoded5 = arp.encode(" DreamTheater ");
- Assert.assertEquals(expected5,encoded5);
- }
-
- //@Test
- public void testBuildRuleType()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
- String input = "IPV4";
- String expected = "<rule-type = IPV4>";
- Assert.assertEquals(expected,arp.buildRuleType(input));
- }
-
- // @Test
- public void testRuleTypeSetNull()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
- String expected = "<rule-type = >";
- Assert.assertEquals(expected,arp.buildRuleType(null));
- }
-
- //@Test
- public void testBuildRequestKeysWithKeyNull()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
- List<RequestKey> requestKeyList = new ArrayList<RequestKey>();
- requestKeyList.add(null);
- String properties= arp.buildRequestKeyExpression(requestKeyList);
- Assert.assertEquals("<request-keys = >",properties);
- }
-
- //@Test
- public void testBuildResponseKeysWithKeyNull()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
- List<ResponseKey> responseKeyList = new ArrayList<ResponseKey>();
- responseKeyList.add(null);
- String properties= arp.buildResponseKeyExpression(responseKeyList);
- Assert.assertEquals("<response-keys = >",properties);
- }
-
- //@Test
- public void testBuildSourceSystem()
- {
- ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
- Assert.assertEquals("<source-system = INSTAR>",arp.buildSourceSystem("INSTAR"));
- }
- //@Test
- private List<RequestKey> createRequestKeys()
- {
- //Create RequestKey object 1
- RequestKey requestKey1 = new RequestKey();
- requestKey1.setKeyName("class-type");
- requestKey1.setKeyValue("interface-ip-address");
-
- //Create RequestKey object 2
- RequestKey requestKey2 = new RequestKey();
- requestKey2.setKeyName("address_fqdn");
- requestKey2.setKeyValue("00000000000000");
-
- //Create RequestKey object 3
- RequestKey requestKey3 = new RequestKey();
- requestKey3.setKeyName("address_type");
- requestKey3.setKeyValue("v4");
-
- //Add the RequestKey Objects to the List
- List<RequestKey> requestKeyList = new ArrayList<RequestKey>();
- requestKeyList.add(requestKey1);
- requestKeyList.add(requestKey2);
- requestKeyList.add(requestKey3);
- return requestKeyList;
- }
- //@Test
- private List<ResponseKey> createResponseKeys()
- {
- //Create RequestKey object 1
- ResponseKey responseKey1 = new ResponseKey();
-
- responseKey1.setUniqueKeyName("address-fqdn");
- responseKey1.setUniqueKeyValue("0000000000000");
- responseKey1.setFieldKeyName("ipaddress-v4");
-
- ResponseKey responseKey2 = new ResponseKey();
- responseKey2.setUniqueKeyName("key2");
- responseKey2.setUniqueKeyValue("value2");
- responseKey2.setFieldKeyName("field2");
-
-
- //Add the RequestKey Objects to the List
- List<ResponseKey> responseKeyList = new ArrayList<ResponseKey>();
- responseKeyList.add(responseKey1);
- responseKeyList.add(responseKey2);
-
- return responseKeyList;
- }
-}
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.config.params.transformer.tosca;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openecomp.sdnc.config.params.data.RequestKey;
+import org.openecomp.sdnc.config.params.data.ResponseKey;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestPropertyQueryString
+{
+ @Test
+ public void testBuildResponseKeys()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+ String properties= arp.buildResponseKeyExpression(createResponseKeys());
+ Assert.assertEquals("<response-keys = address-fqdn:0000000000000:ipaddress-v4 , key2:value2:field2>",properties);
+ }
+
+ @Test
+ public void testBuildRequestKeys()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+ String properties= arp.buildRequestKeyExpression(createRequestKeys());
+ Assert.assertEquals("<request-keys = class-type:interface-ip-address , address_fqdn:00000000000000 , address_type:v4>",properties);
+ }
+
+ @Test
+ public void testEncoding()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+
+ String expected1 = "&lt;class-type&gt;";
+ String encoded1 = arp.encode("<class-type>");
+ Assert.assertEquals(expected1,encoded1);
+
+ String expected2 = "&lt;&lt;&lt;metallica&lt;&gt;iron_maiden&gt;&gt;&gt;";
+ String encoded2 = arp.encode("<<<metallica<>iron_maiden>>>");
+ Assert.assertEquals(expected2,encoded2);
+
+ String expected3 = "band-list&colon;metallica&comma;ironmaiden";
+ String encoded3 = arp.encode("band-list:metallica,ironmaiden");
+ Assert.assertEquals(expected3,encoded3);
+
+ String expected4 = "motorhead&equals;lemmy";
+ String encoded4 = arp.encode("motorhead=lemmy");
+ Assert.assertEquals(expected4,encoded4);
+
+ String expected5 = "DreamTheater";
+ String encoded5 = arp.encode(" DreamTheater ");
+ Assert.assertEquals(expected5,encoded5);
+ }
+
+ @Test
+ public void testBuildRuleType()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+ String input = "IPV4";
+ String expected = "<rule-type = IPV4>";
+ Assert.assertEquals(expected,arp.buildRuleType(input));
+ }
+
+ @Test
+ public void testRuleTypeSetNull()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+ String expected = "<rule-type = >";
+ Assert.assertEquals(expected,arp.buildRuleType(null));
+ }
+
+ @Test
+ public void testBuildRequestKeysWithKeyNull()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+ List<RequestKey> requestKeyList = new ArrayList<RequestKey>();
+ requestKeyList.add(null);
+ String properties= arp.buildRequestKeyExpression(requestKeyList);
+ Assert.assertEquals("<request-keys = >",properties);
+ }
+
+ @Test
+ public void testBuildResponseKeysWithKeyNull()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+ List<ResponseKey> responseKeyList = new ArrayList<ResponseKey>();
+ responseKeyList.add(null);
+ String properties= arp.buildResponseKeyExpression(responseKeyList);
+ Assert.assertEquals("<response-keys = >",properties);
+ }
+
+ @Test
+ public void testBuildSourceSystem()
+ {
+ ArtifactProcessorImpl arp = new ArtifactProcessorImpl();
+ Assert.assertEquals("<source-system = source>",arp.buildSourceSystem("source"));
+ }
+
+ //@Test
+ private List<RequestKey> createRequestKeys()
+ {
+ //Create RequestKey object 1
+ RequestKey requestKey1 = new RequestKey();
+ requestKey1.setKeyName("class-type");
+ requestKey1.setKeyValue("interface-ip-address");
+
+ //Create RequestKey object 2
+ RequestKey requestKey2 = new RequestKey();
+ requestKey2.setKeyName("address_fqdn");
+ requestKey2.setKeyValue("00000000000000");
+
+ //Create RequestKey object 3
+ RequestKey requestKey3 = new RequestKey();
+ requestKey3.setKeyName("address_type");
+ requestKey3.setKeyValue("v4");
+
+ //Add the RequestKey Objects to the List
+ List<RequestKey> requestKeyList = new ArrayList<RequestKey>();
+ requestKeyList.add(requestKey1);
+ requestKeyList.add(requestKey2);
+ requestKeyList.add(requestKey3);
+ return requestKeyList;
+ }
+
+ //@Test
+ private List<ResponseKey> createResponseKeys()
+ {
+ //Create RequestKey object 1
+ ResponseKey responseKey1 = new ResponseKey();
+
+ responseKey1.setUniqueKeyName("address-fqdn");
+ responseKey1.setUniqueKeyValue("0000000000000");
+ responseKey1.setFieldKeyName("ipaddress-v4");
+
+ ResponseKey responseKey2 = new ResponseKey();
+ responseKey2.setUniqueKeyName("key2");
+ responseKey2.setUniqueKeyValue("value2");
+ responseKey2.setFieldKeyName("field2");
+
+ //Add the RequestKey Objects to the List
+ List<ResponseKey> responseKeyList = new ArrayList<ResponseKey>();
+ responseKeyList.add(responseKey1);
+ responseKeyList.add(responseKey2);
+
+ return responseKeyList;
+ }
+}
diff --git a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestReadArtifact.java b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestReadArtifact.java
index 3abd84138..1b65a21f6 100644
--- a/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestReadArtifact.java
+++ b/appc-config/appc-config-params/provider/src/test/java/org/openecomp/sdnc/config/params/transformer/tosca/TestReadArtifact.java
@@ -24,7 +24,6 @@
package org.openecomp.sdnc.config.params.transformer.tosca;
-//import static org.junit.Assert;
import org.junit.Assert;
import org.junit.Test;
import org.openecomp.sdnc.config.params.data.PropertyDefinition;
@@ -32,13 +31,8 @@ import org.openecomp.sdnc.config.params.transformer.tosca.exceptions.ArtifactPro
import java.io.*;
-
-/**
- * @author thakkerp
- * @since March 23,2017
- */
public class TestReadArtifact {
-// @Test
+ @Test
public void testReadArtifactPositive() throws ArtifactProcessorException, IOException {
String toscaArtifact = getFileContent("tosca/ReadArtifactPositiveInputTosca.yml");
@@ -49,34 +43,34 @@ public class TestReadArtifact {
Assert.assertEquals(ouptPD.getParameters().get(0).getDefaultValue(),"0.0.0.0");
Assert.assertEquals(ouptPD.getParameters().get(0).getName(),"abc");
- Assert.assertEquals(ouptPD.getParameters().get(0).getSource(),"INSTAR");
+ Assert.assertEquals(ouptPD.getParameters().get(0).getSource(),"source");
Assert.assertEquals(ouptPD.getParameters().get(0).getRuleType(),"interface-ip-address");
Assert.assertEquals(ouptPD.getParameters().get(0).getDescription(),"param_desc");
Assert.assertEquals(ouptPD.getParameters().get(0).getType(),"param1_type");
Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyName(),"address_fqdn");
- Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyValue(),"000000000");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyValue(),"0");
Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyName(),"address_fqdn");
- Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyValue(),"000000000");
- Assert.assertEquals(ouptPD.getParameters().get(0).getResponseKeys().get(0).getUniqueKeyName(),"address-fqdn");
- //Assert.assertEquals(ouptPD.getParameters().get(0).getResponseKeys().get(0).getUniqueKeyValue(),"000000000");
- Assert.assertEquals(ouptPD.getParameters().get(0).getResponseKeys().get(0).getFieldKeyName(),"ipaddress-v4");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyValue(),"0");
+ Assert.assertEquals(ouptPD.getParameters().get(0).getResponseKeys().get(0).getUniqueKeyName(),"address-0");
+ Assert.assertEquals(ouptPD.getParameters().get(0).getResponseKeys().get(0).getFieldKeyName(),"0");
- Assert.assertEquals(ouptPD.getParameters().get(1).getDefaultValue(),"0:0:0:0:0:0:0:0");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getDefaultValue(),"value");
Assert.assertEquals(ouptPD.getParameters().get(1).getName(),"param 2");
- Assert.assertEquals(ouptPD.getParameters().get(1).getSource(),"INSTAR");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getSource(),"source");
Assert.assertEquals(ouptPD.getParameters().get(1).getRuleType(),"interface-ip-address");
Assert.assertEquals(ouptPD.getParameters().get(1).getDescription(),"param2");
Assert.assertEquals(ouptPD.getParameters().get(1).getType(),"param2 type");
Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyName(),"address_fqdn");
- Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyValue(),"000000000");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(0).getKeyValue(),"0");
Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(1).getKeyName(),"address_type");
Assert.assertEquals(ouptPD.getParameters().get(1).getRequestKeys().get(1).getKeyValue(),"v4");
- Assert.assertEquals(ouptPD.getParameters().get(1).getResponseKeys().get(0).getUniqueKeyName(),"address-fqdn");
- Assert.assertEquals(ouptPD.getParameters().get(1).getResponseKeys().get(0).getUniqueKeyValue(),"000000000");
- Assert.assertEquals(ouptPD.getParameters().get(1).getResponseKeys().get(0).getFieldKeyName(),"ipaddress-v4");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getResponseKeys().get(0).getUniqueKeyName(),"address-0");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getResponseKeys().get(0).getUniqueKeyValue(),"0");
+ Assert.assertEquals(ouptPD.getParameters().get(1).getResponseKeys().get(0).getFieldKeyName(),"0");
}
-//@Test
+
+ @Test
public void testReadArtifactNegetive() throws IOException {
String toscaArtifact = getFileContent("tosca/ReadArtifactNegetiveInputTosca.yml");
diff --git a/appc-config/appc-config-params/provider/src/test/resources/parser/merge-param.json b/appc-config/appc-config-params/provider/src/test/resources/parser/merge-param.json
index e610d079a..76aebb0ac 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/parser/merge-param.json
+++ b/appc-config/appc-config-params/provider/src/test/resources/parser/merge-param.json
@@ -1,24 +1,4 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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=========================================================
- */
-
- {
+{
"Additional1": "XX.XX.XX",
"Additional2": "XXXXXX",
"Additiona3": "00",
diff --git a/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml b/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml
index 868665fb4..bfb54453d 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml
+++ b/appc-config/appc-config-params/provider/src/test/resources/parser/pd.yaml
@@ -8,10 +8,10 @@ vnf-parameter-list:
required: false
source: "INSTAR"
rule-type: "interface-ip-address"
- default: "192.168.30.1"
+ default: "0.0.0.0"
request-keys:
- key-name: "address_fqdn"
- key-value: "someValue"
+ key-value: "value"
- key-name: "address_type"
key-value: "v4"
response-keys: null
@@ -21,10 +21,10 @@ vnf-parameter-list:
required: false
source: "INSTAR"
rule-type: null
- default: "fd00:f4d5:ea06:1:0:110:136:254"
+ default: "0:0:0:0"
request-keys:
- key-name: "address_fqdn"
- key-value: "someValue"
+ key-value: "value"
- key-name: "address_type"
key-value: "v4"
response-keys: null
@@ -34,7 +34,7 @@ vnf-parameter-list:
required: false
source: null
rule-type: null
- default: "192.168.30.1"
+ default: "0.0.0.0"
request-keys: null
response-keys: null
- name: "REMOTE_ACCESS_IP_ADDR"
@@ -43,7 +43,7 @@ vnf-parameter-list:
required: false
source: null
rule-type: null
- default: "192.168.30.1"
+ default: "0.0.0.0"
request-keys: null
response-keys: null
- name: "REMOTE_CORE_ALT_IP_ADDR"
@@ -52,7 +52,7 @@ vnf-parameter-list:
required: false
source: null
rule-type: null
- default: "fd00:f4d5:ea06:1:0:110:136:254"
+ default: "0:0:0:0"
request-keys: null
response-keys: null
- name: "REMOTE_BILLING_IP_ADDR"
@@ -61,7 +61,7 @@ vnf-parameter-list:
required: false
source: "INSTAR"
rule-type: null
- default: "192.168.30.1"
+ default: "0.0.0.0"
request-keys: null
response-keys: null
- name: "CORE_NETWORK_PLEN"
@@ -72,4 +72,4 @@ vnf-parameter-list:
rule-type: null
default: "32"
request-keys: null
- response-keys: null
+ response-keys: null \ No newline at end of file
diff --git a/appc-config/appc-config-params/provider/src/test/resources/parser/request-param.json b/appc-config/appc-config-params/provider/src/test/resources/parser/request-param.json
index f84141b1a..f4dc6f2e3 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/parser/request-param.json
+++ b/appc-config/appc-config-params/provider/src/test/resources/parser/request-param.json
@@ -1,27 +1,6 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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=========================================================
- */
-
- {
- "LOCAL_BILLING_IP_ADDR": "192.168.30.1",
- "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
- "REMOTE_BILLING_IP_ADDR": "192.168.30.1",
+{
+ "LOCAL_BILLING_IP_ADDR": "0.0.0.0",
+ "REMOTE_CORE_ALT_IP_ADDR": "value",
+ "REMOTE_BILLING_IP_ADDR": "0.0.0.0",
"CORE_NETWORK_PLEN": "32"
}
-
diff --git a/appc-config/appc-config-params/provider/src/test/resources/parser/system-param.json b/appc-config/appc-config-params/provider/src/test/resources/parser/system-param.json
index 648abac30..bb3fdfc50 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/parser/system-param.json
+++ b/appc-config/appc-config-params/provider/src/test/resources/parser/system-param.json
@@ -1,24 +1,4 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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=========================================================
- */
-
- {
+{
"LOCAL_ACCESS_IP_ADDR": "XX.XX.XX",
"LOCAL_BILLING_IP_ADDR": "XXXXXX",
"CORE_NETWORK_PLEN": "00"
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml
index 910d15fcb..fb1c06413 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml
+++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition.yml
@@ -1,23 +1,71 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
+---
+kind: "Property Definition"
+version: "V1"
+vnf-parameter-list:
+- name: "LOCAL_ACCESS_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: "interface-ip-address"
+ default: "0.0.0.0"
+ request-keys:
+ - key-name: "address_fqdn"
+ key-value: "value"
+ - key-name: "address_type"
+ key-value: "v4"
+ response-keys: null
+- name: "LOCAL_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "LOCAL_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_ACCESS_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "CORE_NETWORK_PLEN"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "32"
+ request-keys: null
+ response-keys: null \ No newline at end of file
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml
index 910d15fcb..4974dfecb 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml
+++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition2.yml
@@ -1,23 +1,71 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
+---
+kind: "Property Definition"
+version: "V1"
+vnf-parameter-list:
+- name:
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: "interface-ip-address"
+ default: "0.0.0.0"
+ request-keys:
+ - key-name: "address_fqdn"
+ key-value: "value"
+ - key-name: "address_type"
+ key-value: "v4"
+ response-keys: null
+- name: "LOCAL_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "LOCAL_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_ACCESS_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "CORE_NETWORK_PLEN"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "32"
+ request-keys: null
+ response-keys: null \ No newline at end of file
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml
index 910d15fcb..4552dfece 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml
+++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition3.yml
@@ -1,23 +1,70 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
+---
+kind: "Property Definition"
+version: "V1"
+vnf-parameter-list:
+- description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: "interface-ip-address"
+ default: "0.0.0.0"
+ request-keys:
+ - key-name: "address_fqdn"
+ key-value: "value"
+ - key-name: "address_type"
+ key-value: "v4"
+ response-keys: null
+- name: "LOCAL_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "LOCAL_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_ACCESS_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "CORE_NETWORK_PLEN"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "32"
+ request-keys: null
+ response-keys: null \ No newline at end of file
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml
index 910d15fcb..e06b8cb71 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml
+++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExamplePropertyDefinition4.yml
@@ -1,23 +1,70 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
+---
+kind:
+version: "V1"
+vnf-parameter-list:
+- description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: "interface-ip-address"
+ default: "0.0.0.0"
+ request-keys:
+ - key-name: "address_fqdn"
+ key-value: "value"
+ - key-name: "address_type"
+ key-value: "v4"
+ response-keys: null
+- name: "LOCAL_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "LOCAL_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_ACCESS_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_CORE_ALT_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "value"
+ request-keys: null
+ response-keys: null
+- name: "REMOTE_BILLING_IP_ADDR"
+ description: null
+ type: null
+ required: false
+ source: "source"
+ rule-type: null
+ default: "0.0.0.0"
+ request-keys: null
+ response-keys: null
+- name: "CORE_NETWORK_PLEN"
+ description: null
+ type: null
+ required: false
+ source: null
+ rule-type: null
+ default: "32"
+ request-keys: null
+ response-keys: null \ No newline at end of file
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml
index 7c4137c88..766d57083 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml
+++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ExpectedTosca.yml
@@ -1,27 +1,3 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
-
node_types:
Property Definition:
derived_from: org.openecomp.genericvnf
@@ -31,17 +7,17 @@ node_types:
LOCAL_BILLING_IP_ADDR:
type: string
required: false
- default: 192.168.30.1
+ default: 0.0.0.0
status: SUPPORTED
LOCAL_ACCESS_IP_ADDR:
type: string
required: false
- default: 192.168.30.1
+ default: 0.0.0.0
status: SUPPORTED
LOCAL_CORE_ALT_IP_ADDR:
type: string
required: false
- default: fd00:f4d5:ea06:1:0:110:136:254
+ default: value
status: SUPPORTED
CORE_NETWORK_PLEN:
type: string
@@ -51,17 +27,17 @@ node_types:
REMOTE_CORE_ALT_IP_ADDR:
type: string
required: false
- default: fd00:f4d5:ea06:1:0:110:136:254
+ default: value
status: SUPPORTED
REMOTE_ACCESS_IP_ADDR:
type: string
required: false
- default: 192.168.30.1
+ default: 0.0.0.0
status: SUPPORTED
REMOTE_BILLING_IP_ADDR:
type: string
required: false
- default: 192.168.30.1
+ default: 0.0.0.0
status: SUPPORTED
topology_template:
node_templates:
@@ -69,9 +45,9 @@ topology_template:
type: Property Definition
properties:
LOCAL_BILLING_IP_ADDR: <rule-type = > <response-keys = > <source-system = > <request-keys = >
- LOCAL_ACCESS_IP_ADDR: <rule-type = interface-ip-address> <response-keys = > <source-system = INSTAR> <request-keys = address_fqdn:someValue , address_type:v4>
- LOCAL_CORE_ALT_IP_ADDR: <rule-type = > <response-keys = > <source-system = INSTAR> <request-keys = >
+ LOCAL_ACCESS_IP_ADDR: <rule-type = interface-ip-address> <response-keys = > <source-system = source> <request-keys = address_fqdn:value , address_type:v4>
+ LOCAL_CORE_ALT_IP_ADDR: <rule-type = > <response-keys = > <source-system = source> <request-keys = >
CORE_NETWORK_PLEN: <rule-type = > <response-keys = > <source-system = > <request-keys = >
REMOTE_CORE_ALT_IP_ADDR: <rule-type = > <response-keys = > <source-system = > <request-keys = >
REMOTE_ACCESS_IP_ADDR: <rule-type = > <response-keys = > <source-system = > <request-keys = >
- REMOTE_BILLING_IP_ADDR: <rule-type = > <response-keys = > <source-system = INSTAR> <request-keys = >
+ REMOTE_BILLING_IP_ADDR: <rule-type = > <response-keys = > <source-system = source> <request-keys = > \ No newline at end of file
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml
index bb9593ab2..bfc6009d1 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml
+++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactNegetiveInputTosca.yml
@@ -1,27 +1,3 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
-
node_types:
Property Definition:
derived_from: org.openecomp.genericvnf
@@ -32,13 +8,13 @@ node_types:
type: param1_type
description: param_desc
required: false
- default: 192.168.30.1
+ default: 0.0.0.0
status: SUPPORTED
param 2:
type: param2 type
description: param2
required: false
- default: fd00:f4d5:ea06:1:0:110:136:254
+ default: value
status: SUPPORTED
topology_template:
node_templates:
@@ -46,4 +22,4 @@ topology_template:
type: Property Definition
properties:
abc: <> source1 <reqk1:reqv1 , reqk2:reqv2>
- param 2: <rule-type:rule 2> <> source2 <>
+ param 2: <rule-type:rule 2> <> source2 <> \ No newline at end of file
diff --git a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml
index dbd0a5881..5f5defa79 100644
--- a/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml
+++ b/appc-config/appc-config-params/provider/src/test/resources/tosca/ReadArtifactPositiveInputTosca.yml
@@ -1,27 +1,3 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
-
node_types:
Property Definition:
derived_from: org.openecomp.genericvnf
@@ -38,12 +14,12 @@ node_types:
type: param2 type
description: param2
required: abc
- default: 0:0:0:0:0:0:0:0
+ default: value
status: SUPPORTED
topology_template:
node_templates:
Property Definition_Template:
type: Property Definition
properties:
- abc: <rule-type = interface-ip-address> <response-keys = address-fqdn:000000000&equals;000000000:ipaddress-v4 > <source-system=INSTAR> <request-keys=address_fqdn:m001&colon;00000000 , address_type:v&comma;4>
- param 2: <rule-type = interface-ip-address> <response-keys = address-fqdn:000000000:ipaddress-v4 > <source-system = INSTAR> <request-keys = address_fqdn:000000000 , address_type:v4>
+ abc: <rule-type = interface-ip-address> <response-keys = address-0:0:0:0:0&equals;1n004v006:ipaddress-v4 > <source-system=source> <request-keys=address_fqdn:0:0:0:0:0 , address_type:v&comma;4>
+ param 2: <rule-type = interface-ip-address> <response-keys = address-0:0:0:0:0:ipaddress-v4 > <source-system = source> <request-keys = address_fqdn:0:0:0:0:0 , address_type:v4> \ No newline at end of file