From 8491cc3bc012fefe4faf54baf6c74cb20785d5f0 Mon Sep 17 00:00:00 2001 From: Takamune Cho Date: Tue, 19 Dec 2017 10:48:02 -0600 Subject: Update bundle names from openecomp to onap Change-Id: Ib0cf4edbab87a32c9d83cc9473412feb77b27a0e Issue-ID: APPC-13 Signed-off-by: Takamune Cho --- .../src/test/java/org/onap/appc/dg/TestCommonConfig.java | 8 ++++---- .../org/onap/appc/dg/TestConfigurationDocumentRequest.java | 4 ++-- .../src/test/java/org/onap/appc/dg/TestGenerateConfig.java | 4 ++-- .../java/org/onap/appc/dg/TestGenerateTemplateConfig.java | 4 ++-- .../src/test/java/org/onap/appc/dg/TestGetConfigParams.java | 12 ++++++------ .../org/onap/appc/dg/TestProcessParameterDefinition.java | 8 ++++---- .../src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java | 2 +- .../APPC/CheckConfigStatus/ParseErrorLogFail.properties | 6 +++--- .../APPC/CheckConfigStatus/ParseErrorLogSuccess.properties | 6 +++--- .../DownloadCliConfig/DownloadCliConfig_Success.properties | 2 +- .../APPC/GetConfigParams/Json2DGContextFail.properties | 4 ++-- .../GetInstarParamsFail.properties | 4 ++-- .../ProcessParameterDefinition/MergeParamsFail.properties | 10 +++++----- .../PublishConfiguration/PublishConfig_Failure.properties | 4 ++-- 14 files changed, 39 insertions(+), 39 deletions(-) (limited to 'appc-directed-graph/appc-dgraph/provider/src/test') diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java index ca8dbdff1..f7ee5abaa 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java @@ -69,8 +69,8 @@ public class TestCommonConfig /* extends AbstractDGTestCase */ { Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode",new org.openecomp.sdnc.config.generator.convert.ConvertNode()); - serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor()); @@ -198,8 +198,8 @@ public class TestCommonConfig /* extends AbstractDGTestCase */ { callGraph10XML }; Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode",new org.openecomp.sdnc.config.generator.convert.ConvertNode()); - serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java index a4592e72e..801b61097 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java @@ -47,8 +47,8 @@ public class TestConfigurationDocumentRequest /* extends AbstractDGTestCase */ { String injectGraphXmls[] = new String[] { configurationDocumentRequestXML}; Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode",new org.openecomp.sdnc.config.generator.convert.ConvertNode()); - serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); GraphKey graphKey = new GraphKey("SDC-MESSAGE", null, "configuration-document-request", null); DGTestCase tc = new DGTestCase(graphKey); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java index f329d6b6c..8ead2afef 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java @@ -68,7 +68,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ { Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode()); + serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin()); @@ -105,7 +105,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ { Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode()); + serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin()); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java index 250e4ac30..cd279f326 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java @@ -53,7 +53,7 @@ public class TestGenerateTemplateConfig /* extends AbstractDGTestCase */ { serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin()); - serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode()); + serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); // Register Call graphs String injectGraphXmls[] = new String[] { generateConfigXML }; @@ -85,7 +85,7 @@ public class TestGenerateTemplateConfig /* extends AbstractDGTestCase */ { serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin()); - serviceReferences.put("org.openecomp.sdnc.config.generator.merge.MergeNode", new org.openecomp.sdnc.config.generator.merge.MergeNode()); + serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode()); // Register Call graphs String injectGraphXmls[] = new String[] { generateConfigXML }; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java index fd219b013..d14bb8339 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java @@ -53,7 +53,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ { Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode()); // Register Call graphs String injectGraphXmls[] = new String[] { getConfigParamsXML }; @@ -87,7 +87,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ { String propertyfileName = "APPC/GetConfigParams/TemplateName.properties"; Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode()); // Register Call graphs String injectGraphXmls[] = new String[] { getConfigParamsXML }; @@ -118,7 +118,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ { String propertyfileName = "APPC/GetConfigParams/CliString.properties"; Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode()); // Register Call graphs @@ -152,7 +152,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ { - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode()); // Register Call graphs String injectGraphXmls[] = new String[] { getConfigParamsXML }; @@ -186,7 +186,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ { - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode()); // Register Call graphs String injectGraphXmls[] = new String[] { getConfigParamsXML }; @@ -216,7 +216,7 @@ public class TestGetConfigParams /* extends AbstractDGTestCase */ { Map serviceReferences = new HashMap(); - serviceReferences.put("org.openecomp.sdnc.config.generator.convert.ConvertNode", new org.openecomp.sdnc.config.generator.convert.ConvertNode()); + serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode()); // Register Call graphs String injectGraphXmls[] = new String[] { getConfigParamsXML }; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java index f638c00c9..fd14d83cd 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java @@ -56,7 +56,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ { - serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode()); + serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode()); @@ -92,7 +92,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ { - serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode()); + serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode()); @@ -125,7 +125,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ { - serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode()); + serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode()); @@ -223,7 +223,7 @@ public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ { - serviceReferences.put("org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode", new org.openecomp.sdnc.config.params.parser.PropertyDefinitionNode()); + serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode()); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java index 05e7fa5cd..e8733b54e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java @@ -72,7 +72,7 @@ public class TestUpdateAaiInfo /* extends AbstractDGTestCase */ { Map resourceReferences = new HashMap(); - resourceReferences.put("org.openecomp.sdnc.sli.aai.AAIService", new MockAaiResource()); + resourceReferences.put("org.onap.ccsdk.sli.adaptors.aai.AAIService", new MockAaiResource()); GraphKey graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null); DGTestCase tc = new DGTestCase(graphKey); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties index 2f5d42c94..300010200 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties @@ -23,10 +23,10 @@ input.configfilereference-failure.TARGET-FILE-PATH=FailureFile input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile input.vnf-host-ip-address=135.1.1.1 input.fileContents=ERRORLOG -org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=failure -org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG +org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=failure +org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG -org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.error-message=Unable to parse Error Log +org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.error-message=Unable to parse Error Log assertEquals.error-code=401 assertEquals.error-message=Unable to parse Error Log diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties index c40d93f96..ee2d47f11 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties @@ -24,9 +24,9 @@ input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile input.vnf-host-ip-address=135.1.1.1 input.fileContents=ERRORLOG -org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=success -org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.parsedError=Download Failure -org.openecomp.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG +org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=success +org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.tmp.patternNode.parsedError=Download Failure +org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG assertEquals.error-code=401 assertEquals.error-message=Configuration has failed.Download Failure diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties index a4d40f257..fd682a90f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties @@ -31,7 +31,7 @@ input.device-config=tcfile:///cli_config_content.txt # SQL Resource Node #---------------------------- #