From 8eb9f5d4a673cb1ab18423b7e84ec8bc6c96c5b6 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Tue, 6 Feb 2018 16:11:42 -0500 Subject: Removing old name references Removing references to bvc, att Change-Id: I794861fe40b96c922f6e5c011b2fe5d2c4bc515b Signed-off-by: Patrick Brady Issue-ID: APPC-292 --- appc-directed-graph/appc-dgraph/provider/pom.xml | 32 ----------- .../json/APPC/APPC_DownloadNetconfConfig.json | 2 +- .../json/APPC/APPC_DownloadRestconfConfig.json | 4 +- .../json/APPC/APPC_GetDeviceRunningConfig.json | 6 +-- .../json/APPC/APPC_ProcessParameterDefinition.json | 2 +- .../json/APPC/APPC_PublishConfiguration.json | 4 +- .../Appc-API_audit-configuration-notification.json | 10 ++-- .../Appc-API_audit-configuration-operation.json | 2 +- .../Appc-API_service-configuration-activate.json | 2 +- .../Appc-API_service-configuration-backup.json | 2 +- ...ppc-API_service-configuration-notification.json | 10 ++-- .../Appc-API_service-configuration-operation.json | 2 +- .../Appc-API_service-configuration-prepare.json | 2 +- .../Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json | 2 +- .../Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json | 2 +- .../APPC_Restart-Active-Passive_VNFC.json | 2 +- .../APPC_StartApplication_VM_vSCP.json | 4 +- .../APPC_StopApplication_VM_vSCP_2.0.0.json | 6 +-- .../APPC_method_Generic_Audit_2.0.0.json | 2 +- .../APPC_method_Generic_Sync_2.0.0.json | 2 +- .../Appc-API_2.0.0.0_method_VSCP_HealthCheck.json | 2 +- .../Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json | 2 +- ...ppc-API_2.0.0.0_method_VSCP_SoftwareUpload.json | 2 +- ...0.0.0_method_VSCP_UpgradePreconditionCheck.json | 2 +- .../org/onap/appc/dg/TestCheckConfigStatus.java | 6 +-- .../java/org/onap/appc/dg/TestCommonConfig.java | 6 +-- .../appc/dg/TestConfigurationDocumentRequest.java | 6 +-- .../test/java/org/onap/appc/dg/TestConfigure.java | 6 +-- .../org/onap/appc/dg/TestDownloadCliConfig.java | 8 +-- .../org/onap/appc/dg/TestDownloadIsbcConfig.java | 6 +-- .../java/org/onap/appc/dg/TestGenerateConfig.java | 10 ++-- .../onap/appc/dg/TestGenerateTemplateConfig.java | 6 +-- .../test/java/org/onap/appc/dg/TestGetAaiInfo.java | 6 +-- .../java/org/onap/appc/dg/TestGetConfigParams.java | 6 +-- .../onap/appc/dg/TestGetDeviceRunningConfig.java | 6 +-- .../java/org/onap/appc/dg/TestGetVfModuleInfo.java | 6 +-- .../appc/dg/TestProcessParameterDefinition.java | 6 +-- .../org/onap/appc/dg/TestSaveRunningConfig.java | 6 +-- .../test/java/org/onap/appc/dg/TestSetStatus.java | 6 +-- .../java/org/onap/appc/dg/TestUpdateAaiInfo.java | 6 +-- .../appc/dg/mock/instance/MockAaiResource.java | 4 +- .../mock/instance/MockConfigureNodeExecutor.java | 4 +- .../PublishConfig_Success.properties | 2 +- .../SaveRunningConfig_Success.properties | 2 +- .../APPC_method_CommonConfiguration_TC2.properties | 38 ++++++------- .../properties/tcfile/noinstarparams_pd.yaml | 8 +-- .../properties/tcfile/payload_cli_config.json | 62 +++++++++++----------- .../properties/tcfile/payload_json_config.json | 58 ++++++++++---------- .../src/test/resources/properties/tcfile/pd.yaml | 4 +- appc-directed-graph/dg-loader/provider/pom.xml | 36 ------------- .../onap/sdnc/dg/loader/DGXMLLoadNActivate.java | 5 -- .../src/main/resources/scripts/dg_load_activate.sh | 38 +++++++------ 52 files changed, 203 insertions(+), 268 deletions(-) (limited to 'appc-directed-graph') diff --git a/appc-directed-graph/appc-dgraph/provider/pom.xml b/appc-directed-graph/appc-dgraph/provider/pom.xml index 3b6c67448..57f905ad3 100644 --- a/appc-directed-graph/appc-dgraph/provider/pom.xml +++ b/appc-directed-graph/appc-dgraph/provider/pom.xml @@ -126,38 +126,6 @@ - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.brocade.developer - - - providermodule-plugin - - - [1.2.0.100-SNAPSHOT,) - - - process - - - - - - - - - - org.eclipse.m2e lifecycle-mapping diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json index f691af86d..cddf5012b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadNetconfConfig.json @@ -51,7 +51,7 @@ "id": "96807105.79369", "type": "execute", "name": "execute : Download Configuration", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 533, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json index ee5977320..19769807a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_DownloadRestconfConfig.json @@ -51,7 +51,7 @@ "id": "b7e24e35.0af5c", "type": "execute", "name": "execute : Download Configuration", - "xml": "\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 523, @@ -162,7 +162,7 @@ "id": "3fd1791d.d55476", "type": "execute", "name": "execute : Mount Device", - "xml": "\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 459, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json index 5242a5d87..918e7c8cc 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_GetDeviceRunningConfig.json @@ -62,7 +62,7 @@ "id": "f83cb7cd.e4dd78", "type": "execute", "name": "execute: Get Rest Configuration", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, "x": 704.75, @@ -460,8 +460,8 @@ { "id": "fde847ff.94d008", "type": "comment", - "name": "User Story ID: US731106", - "info": "Developed by Brinda Santh ", + "name": "comment1", + "info": "comment1", "comments": "", "x": 887.7499694824219, "y": 28.75, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json index 50b215ab7..3a6cb1769 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json @@ -414,7 +414,7 @@ "id": "7f1ad793.7b648", "type": "execute", "name": "execute read PD file", - "xml": "\n\n", + "xml": "\n\n", "comments": "", "outputs": 1, "x": 1466.5, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json index ac9bde9fa..08bfe32cd 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_PublishConfiguration.json @@ -293,7 +293,7 @@ "id": "949cd4f7.5ed8f", "type": "set", "name": "set fileName", - "xml": "\n\n", + "xml": "\n\n", "comments": "", "x": 457, "y": 164, @@ -392,7 +392,7 @@ "id": "38f8974.498d2e8", "type": "set", "name": "set dcae-error-message", - "xml": "\n\n", + "xml": "\n\n", "comments": "", "x": 1596, "y": 376, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json index 181b5bc32..c3bfc542a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-notification.json @@ -210,7 +210,7 @@ "id": "235a2caa.dc26a4", "type": "configure", "name": "SDN_GP Asynch Notification", - "xml": "\n\n", + "xml": "\n\n", "comments": "", "outputs": 1, "x": 783.4718627929688, @@ -276,7 +276,7 @@ "id": "f43f3748.859d08", "type": "execute", "name": "execute: EIPAM_UnassignIPAddress", - "xml": "\n\t", + "xml": "\n\t", "outputs": 1, "x": 2643.284980773926, "y": 4735.545325279236, @@ -309,7 +309,7 @@ "id": "86c2f124.a637c", "type": "configure", "name": "MSO Asynch Notification", - "xml": "\n \n", + "xml": "\n \n", "outputs": 1, "x": 2613.2713928222656, "y": 4886.871339797974, @@ -448,7 +448,7 @@ "id": "a7de75f9.c2b138", "type": "configure", "name": "SDN-GP Asynch Notification", - "xml": "\n\n", + "xml": "\n\n", "comments": "", "outputs": 1, "x": 852, @@ -512,7 +512,7 @@ "id": "583ef652.3fb778", "type": "execute", "name": "execute: setTime(modify-timestamp)", - "xml": "\n\t", + "xml": "\n\t", "comments": "", "outputs": 1, "x": 1187, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json index d94222831..68917335c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_audit-configuration-operation.json @@ -494,7 +494,7 @@ "id": "66448305.03e3cc", "type": "execute", "name": "execute getTimeDifference", - "xml": "\n\t\n\t", + "xml": "\n\t\n\t", "comments": "", "outputs": 1, "x": 1085, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json index 8e7d80212..53042ac6f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-activate.json @@ -190,7 +190,7 @@ "id": "d5e2186e.f0d268", "type": "execute", "name": "execute: setTime(modify-timestamp)", - "xml": "\n\t", + "xml": "\n\t", "comments": "", "outputs": 1, "x": 821.7498779296875, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json index d3b38b439..093ecd7bf 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-backup.json @@ -379,7 +379,7 @@ "id": "ed61d3df.d15ae", "type": "execute", "name": "execute: setTime(modify-timestamp)", - "xml": "\n\t", + "xml": "\n\t", "comments": "", "outputs": 1, "x": 368.5, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json index 65d24eec0..ceb4caa92 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-notification.json @@ -240,7 +240,7 @@ "id": "b94ddf6d.56216", "type": "configure", "name": "SDN_GP Asynch Notification", - "xml": "\n\n", + "xml": "\n\n", "comments": "", "outputs": 1, "x": 672.9213256835938, @@ -306,7 +306,7 @@ "id": "7b44beed.e0798", "type": "execute", "name": "execute: EIPAM_UnassignIPAddress", - "xml": "\n\t", + "xml": "\n\t", "outputs": 1, "x": 2874.284980773926, "y": 5149.545325279236, @@ -339,7 +339,7 @@ "id": "d6d749b0.cfeac8", "type": "configure", "name": "MSO Asynch Notification", - "xml": "\n \n", + "xml": "\n \n", "outputs": 1, "x": 2844.2713928222656, "y": 5300.871339797974, @@ -395,7 +395,7 @@ "id": "bbe81125.eaf2d", "type": "configure", "name": "SDN_GP Asynch Notification", - "xml": "\n", + "xml": "\n", "comments": "", "outputs": 1, "x": 827.0951843261719, @@ -747,7 +747,7 @@ "id": "3fdf2b46.361354", "type": "execute", "name": "execute: setTime(modify-timestamp)", - "xml": "\n\t", + "xml": "\n\t", "comments": "", "outputs": 1, "x": 1104.4494934082031, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json index a426f3cc1..aa76741a1 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-operation.json @@ -310,7 +310,7 @@ "id": "db7678e6.fdbd48", "type": "execute", "name": "execute getTimeDifference", - "xml": "\n\t\n\t", + "xml": "\n\t\n\t", "comments": "", "outputs": 1, "x": 950.8333435058594, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json index 1328fce3c..623918e1c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Appc-API/Appc-API_service-configuration-prepare.json @@ -265,7 +265,7 @@ "id": "a87cb168.0c421", "type": "execute", "name": "execute: setTime(modify-timestamp)", - "xml": "\n\t", + "xml": "\n\t", "comments": "", "outputs": 1, "x": 914.7498779296875, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json index 7754ee777..9885d251f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Check-Active_VNFC_vSCP.json @@ -51,7 +51,7 @@ "id": "906908fc.43cf18", "type": "execute", "name": "execute", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, "x": 920.306266784668, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json index 3169f3b04..8815913d6 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_HealthCheck_VNF_vSCP.json @@ -133,7 +133,7 @@ "id": "3f7d06de.4adc9a", "type": "execute", "name": "executeTest", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, "x": 741.8060150146484, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json index b7b919e3a..d8ab02567 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_Restart-Active-Passive_VNFC.json @@ -717,7 +717,7 @@ "id": "e7b3ea7a.c2c148", "type": "execute", "name": "executePreRestart", - "xml": "\n", + "xml": "\n", "comments": "", "outputs": 1, "x": 700.8542175292969, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json index 102ae397b..22585cf25 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StartApplication_VM_vSCP.json @@ -51,7 +51,7 @@ "id": "5fb00be2.55cd14", "type": "execute", "name": "Start Application ", - "xml": "\n\n\n", + "xml": "\n\n\n", "comments": "", "outputs": 1, "x": 575.470588684082, @@ -359,7 +359,7 @@ "id": "6c8ebab7.6be074", "type": "execute", "name": "Get Node Name", - "xml": "\n\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, "x": 595.888916015625, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json index eb94a37c8..07406edff 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_StopApplication_VM_vSCP_2.0.0.json @@ -168,7 +168,7 @@ "id": "cba91b7e.1a9828", "type": "execute", "name": "Execute stop node", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, "x": 907.5, @@ -255,7 +255,7 @@ "id": "bb87dbed.34a348", "type": "execute", "name": "Healthcheck to get Node Name", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, "x": 447.5, @@ -367,7 +367,7 @@ "id": "d6d1b7f.22dce48", "type": "execute", "name": "Select vnf-host-ip via connection test", - "xml": "\n\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, "x": 464.5, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json index 2aedf4b8f..04df73d93 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Audit_2.0.0.json @@ -1280,7 +1280,7 @@ "id": "93ba279d.5bcbb8", "type": "execute", "name": "execute CvaasDataIntoContext", - "xml": "\n\n\n", + "xml": "\n\n\n", "comments": "", "outputs": 1, "x": 1769.583999633789, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json index ef781c1e9..ca9574796 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/APPC_method_Generic_Sync_2.0.0.json @@ -1043,7 +1043,7 @@ "id": "7e300025.5253a", "type": "execute", "name": "execute CvaasDataIntoContext", - "xml": "\n\n\n", + "xml": "\n\n\n", "comments": "", "outputs": 1, "x": 1943.9172744750977, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json index 19046f502..830b56159 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_HealthCheck.json @@ -209,7 +209,7 @@ "id": "bcfe699a.fbac68", "type": "execute", "name": "executeTest", - "xml": "\n", + "xml": "\n", "comments": "", "outputs": 1, "x": 940.7498474121094, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json index 35ec375f0..adb0bdc6d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_LiveUpgrade.json @@ -138,7 +138,7 @@ "id": "6711af89.05acc", "type": "execute", "name": "execute: liveUpgrade", - "xml": "\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 919.5277938842773, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json index fe978a047..7f6b3f7c5 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_SoftwareUpload.json @@ -170,7 +170,7 @@ "id": "6a8d06b2.533f18", "type": "execute", "name": "executeUpload", - "xml": "\n\n\n", + "xml": "\n\n\n", "comments": "", "outputs": 1, "x": 1714.7499732971191, diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json index 2fb4fc8cc..3120a1fe2 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json +++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/Dispatcher-DG/Appc-API_2.0.0.0_method_VSCP_UpgradePreconditionCheck.json @@ -127,7 +127,7 @@ "id": "85331eac.44b8c", "type": "execute", "name": "Execute: PreUpgradeHealthCheck", - "xml": "\n", + "xml": "\n", "comments": "", "outputs": 1, "x": 311.9999694824219, diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java index 994fbc7b2..6aba42b1a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* TODO: move the dgtest to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; 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 3c939cbe3..1e7835c85 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 @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import org.onap.sdnc.config.generator.convert.ConvertNode; import org.onap.sdnc.config.generator.merge.MergeNode; /* move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; 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 9f6d676b7..29d7b0f4c 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 @@ -30,9 +30,9 @@ import java.util.Map; import org.junit.Test; /* move to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java index 6022ac834..894ddd7c2 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java index 2f6f7459a..3cf70fe44 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java @@ -32,10 +32,10 @@ import org.junit.Test; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGMockUtils; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGMockUtils; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java index 231dd6b0a..87d3f4561 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java @@ -32,9 +32,9 @@ import org.junit.Test; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import com.att.eelf.configuration.EELFLogger; 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 af0423b0d..36c549ad0 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 @@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; import org.apache.sling.testing.mock.osgi.MockOsgi; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; @@ -73,7 +73,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ { Map serviceReferences = new HashMap(); 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.config.generator.node.ConfigResourceNode", new MockConfigResourceNode()); serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin()); @@ -110,7 +110,7 @@ public class TestGenerateConfig /* extends AbstractDGTestCase */ { Map serviceReferences = new HashMap(); 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.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 3223cb9e7..95fcf3e9a 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 @@ -37,9 +37,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to opensource -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java index f7307acb2..9587a96c7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java @@ -35,9 +35,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; 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 52e20415e..074aa6ff9 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 @@ -33,9 +33,9 @@ import org.onap.appc.dg.mock.instance.MockConfigureNodeExecutor; import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; /* move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java index b84b0516e..d08bd4f16 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java @@ -32,9 +32,9 @@ import org.junit.Test; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java index 6bc9d10e3..d9b9ad4a6 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java @@ -45,9 +45,9 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need move to open source import org.apache.sling.testing.mock.osgi.MockOsgi; -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor; 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 56b0bab3b..0b5cf7e5d 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 @@ -35,9 +35,9 @@ import org.onap.appc.dg.mock.instance.MockSvcLogicJavaPlugin; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java index f2399729e..bf7d5e2a9 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java @@ -44,9 +44,9 @@ import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; import org.apache.sling.testing.mock.osgi.MockOsgi; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java index 943edf2c1..6cc05179a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java @@ -45,9 +45,9 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* need to move to open source import org.apache.sling.testing.mock.osgi.MockOsgi; -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor; 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 9eed43e8b..a0a20243d 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 @@ -46,9 +46,9 @@ import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /* move to open source import org.apache.sling.testing.mock.osgi.MockOsgi; -import com.att.sdnctl.dgtestlibrary.AbstractDGTestCase; -import com.att.sdnctl.dgtestlibrary.DGTestCase; -import com.att.sdnctl.dgtestlibrary.GraphKey; +import org.onap.sdnc.dgtestlibrary.AbstractDGTestCase; +import org.onap.sdnc.dgtestlibrary.DGTestCase; +import org.onap.sdnc.dgtestlibrary.GraphKey; */ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.provider.ExecuteNodeExecutor; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java index 6d23d13ff..6f3847e97 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java @@ -109,7 +109,7 @@ public class MockAaiResource implements SvcLogicResource { assertEquals(parms.get("is-closed-loop"), "false"); assertEquals(parms.get("vnfc-function-code"), "funccode"); assertEquals(parms.get("vnfc-type"), "vnfctype"); - assertEquals(parms.get("ipaddress-v4-oam-vip"), "135.1.1.1"); + assertEquals(parms.get("ipaddress-v4-oam-vip"), "10.1.1.1"); assertEquals(parms.get("group-notation"), "groupnotation"); assertEquals(parms.get("relationship-list.relationship[0].related-to"), "vserver"); assertEquals(parms.get("relationship-list.relationship[0].relationship-data[0].relationship-key"), "vserver.vserver-id"); @@ -140,7 +140,7 @@ public class MockAaiResource implements SvcLogicResource { assertEquals(parms.get("is-closed-loop"), "false"); assertEquals(parms.get("vnfc-function-code"), "funccode1"); assertEquals(parms.get("vnfc-type"), "vnfctype1"); - assertEquals(parms.get("ipaddress-v4-oam-vip"), "135.2.2.2"); + assertEquals(parms.get("ipaddress-v4-oam-vip"), "10.2.2.2"); assertEquals(parms.get("group-notation"), "groupnotation1"); assertEquals(parms.get("relationship-list.relationship[0].related-to"), "vserver"); assertEquals(parms.get("relationship-list.relationship[0].relationship-data[0].relationship-key"), "vserver.vserver-id"); diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java index 7c2247a26..073c3d725 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java +++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java @@ -37,7 +37,7 @@ public class MockConfigureNodeExecutor implements SvcLogicAdaptor{ if ( "get".equals(key)) { - if ("135.1.1.1".equals(parameters.get("host") )) { + if ("10.1.1.1".equals(parameters.get("host") )) { String fullPathFileName = parameters.get("fullPathFileName"); if (("SuccessFile").equals(fullPathFileName ) ) return ConfigStatus.FAILURE; @@ -46,7 +46,7 @@ public class MockConfigureNodeExecutor implements SvcLogicAdaptor{ if (("FailureLogFile").equals(fullPathFileName ) ) return ConfigStatus.SUCCESS; } - else if ("135.2.2.2".equals(parameters.get("host")) ) { + else if ("10.2.2.2".equals(parameters.get("host")) ) { String fullPathFileName = parameters.get("fullPathFileName"); if (("SuccessFile").equals(fullPathFileName ) ) return ConfigStatus.FAILURE; diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties index 0168b477f..04f6e803b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties @@ -34,6 +34,6 @@ org.onap.appc.dg.common.JsonDgUtil.generateOutputPayloadFromContext.output.paylo assertEquals.output.payload.upload-config-id[0]=12434 -assertEquals.tmp.fileName=/opt/app/bvc/cvaas/ibcx0001v_567890_appc001.json +assertEquals.tmp.fileName=/opt/onap/appc/cvaas/ibcx0001v_567890_appc001.json diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties index 4d6b0aa8f..940ea0e29 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties @@ -44,7 +44,7 @@ org.onap.appc.data.services.node.ConfigResourceNode.updateUploadConfig.tmp.uploa APPC.GetDeviceRunningConfig.outCome=success APPC.PublishConfiguration.outCome=success -com.att.sdnctl.prop.PropertiesNode.readProperties=success +org.onap.ccsdk.sli.plugins.prop.PropertiesNode.readProperties=success assertNull.dcae-error-message diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties index 6e6659c29..e4b86e75e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties @@ -31,25 +31,25 @@ input.input.action=Configure input.input.payload=tcfile://payload_json_config.json -# Property for com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo Execute Action -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 - -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig - -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8 -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig - -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.outCome=success +# Property for org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo Execute Action +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 + +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.VNF-TYPE = vUSP - Metaswitch vSBC +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.PROTOCOL = CLI +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig + +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.CONFIGURE-ACTION-DG-ID = 8 +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.VNF-TYPE = vUSP - Metaswitch vSBC +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.configureactiondg.DOWNLOAD-CONFIG-DG = DownloadIsbcConfig + +org.onap.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.outCome=success # DG APPC.DownloadIsbcConfig properties diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml index 5cf518101..ec9fba843 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/noinstarparams_pd.yaml @@ -25,8 +25,8 @@ parameters: required: false source: null class-type: null - default-value: "fd00:f4d5:ea06:1:0:110:136:254" - assigned-value: "fd00:f4d5:ea06:1:0:110:136:254" + default-value: "10.0.0.147" + assigned-value: "10.0.0.147" path: null request-keys: null response-keys: null @@ -61,8 +61,8 @@ parameters: required: false source: null class-type: null - default-value: "fd00:f4d5:ea06:1:0:110:136:254" - assigned-value: "fd00:f4d5:ea06:1:0:110:136:254" + default-value: "10.0.0.147" + assigned-value: "10.0.0.147" path: null request-keys: null response-keys: null diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json index 9bd143c48..f0230751e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json @@ -1,9 +1,9 @@ { "request-parameters": { "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", + "vnf-host-ip-address": "10.0.0.39", "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", + "site-location": "Somewhere", "vnf-name": "ibcx0001v", "vm": [ { @@ -13,7 +13,7 @@ "vnfc-name": "ibcx0001vm001ssc001", "vnfc-function-code": "ssc", "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", + "ipaddress-v4-oam-vip": "10.1.1.1", "group-notation": "ibcx0001vm001ssc001pair" } ] @@ -32,47 +32,47 @@ ] }, "configuration": { - "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 12.12.12.12\r\n" + "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 10.0.12.12\r\n" }, "configuration-parameters": { "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", - "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "LOCAL_CORE_ALT_IP_ADDR": "10.0.0.147", "LOCAL_BILLING_IP_ADDR": "192.168.30.1", "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", - "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "REMOTE_CORE_ALT_IP_ADDR": "10.0.0.147", "REMOTE_BILLING_IP_ADDR": "192.168.30.1", "CORE_NETWORK_PLEN": "32", "CORE_NETWORK_ALT_PLEN": "126", "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", - "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "ACCESS_NETWORK_PLEN": "32", "ACCESS_NETWORK_ALT_PLEN": "126", - "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "ACCESS_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "BILLING_NETWORK_PLEN": "32", - "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "VIRT_CORE_IP_ADDR": "135.25.69.147", - "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_ACCESS_IP_ADDR": "135.25.69.147", - "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_BILLING_IP_ADDR": "135.25.69.147", - "DNS_SERVERS": "135.25.69.147", - "SNMP_CLIENT_1": "135.25.69.147", - "SNMP_CLIENT_2": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", - "BILLING_SERVER_1": "135.25.69.147", - "BILLING_SERVER_2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", - "OAM_VIP_HOSTNAME": "135.25.69.147", - "DG_APP_SERVER1": "135.25.69.147", - "DG_APP_SERVER2": "135.25.69.147", - "CTS_IP_RANGE": "135.25.69.147", + "BILLING_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "VIRT_CORE_IP_ADDR": "10.0.0.147", + "VIRT_CORE_ALT_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_ALT_IP_ADDR": "10.0.0.147", + "VIRT_BILLING_IP_ADDR": "10.0.0.147", + "DNS_SERVERS": "10.0.0.147", + "SNMP_CLIENT_1": "10.0.0.147", + "SNMP_CLIENT_2": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT1": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT2": "10.0.0.147", + "BILLING_SERVER_1": "10.0.0.147", + "BILLING_SERVER_2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR1": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR3": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR4": "10.0.0.147", + "OAM_VIP_HOSTNAME": "10.0.0.147", + "DG_APP_SERVER1": "10.0.0.147", + "DG_APP_SERVER2": "10.0.0.147", + "CTS_IP_RANGE": "10.0.0.147", "CTS_PREFIX_LENGTH": "26", - "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", + "LICENSE_KEY": "abcd1234", "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json index d6b2ebbe7..794c8d86c 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json @@ -1,7 +1,7 @@ { "request-parameters": { "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", + "vnf-host-ip-address": "10.0.0.39", "service-instance-id": "ibcx0001vm001", "site-location": "Middletown", "vnf-name": "ibcx0001v", @@ -13,7 +13,7 @@ "vnfc-name": "ibcx0001vm001ssc001", "vnfc-function-code": "ssc", "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", + "ipaddress-v4-oam-vip": "10.1.1.1", "group-notation": "ibcx0001vm001ssc001pair" } ] @@ -42,43 +42,43 @@ }, "configuration-parameters": { "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", - "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "LOCAL_CORE_ALT_IP_ADDR": "10.0.0.147", "LOCAL_BILLING_IP_ADDR": "192.168.30.1", "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", - "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "REMOTE_CORE_ALT_IP_ADDR": "10.0.0.147", "REMOTE_BILLING_IP_ADDR": "192.168.30.1", "CORE_NETWORK_PLEN": "32", "CORE_NETWORK_ALT_PLEN": "126", "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", - "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "ACCESS_NETWORK_PLEN": "32", "ACCESS_NETWORK_ALT_PLEN": "126", - "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "ACCESS_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "10.0.0.147", "BILLING_NETWORK_PLEN": "32", - "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "VIRT_CORE_IP_ADDR": "135.25.69.147", - "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_ACCESS_IP_ADDR": "135.25.69.147", - "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_BILLING_IP_ADDR": "135.25.69.147", - "DNS_SERVERS": "135.25.69.147", - "SNMP_CLIENT_1": "135.25.69.147", - "SNMP_CLIENT_2": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", - "BILLING_SERVER_1": "135.25.69.147", - "BILLING_SERVER_2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", - "OAM_VIP_HOSTNAME": "135.25.69.147", - "DG_APP_SERVER1": "135.25.69.147", - "DG_APP_SERVER2": "135.25.69.147", - "CTS_IP_RANGE": "135.25.69.147", + "BILLING_NETWORK_DEFAULT_GATEWAY": "10.0.0.147", + "VIRT_CORE_IP_ADDR": "10.0.0.147", + "VIRT_CORE_ALT_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_IP_ADDR": "10.0.0.147", + "VIRT_ACCESS_ALT_IP_ADDR": "10.0.0.147", + "VIRT_BILLING_IP_ADDR": "10.0.0.147", + "DNS_SERVERS": "10.0.0.147", + "SNMP_CLIENT_1": "10.0.0.147", + "SNMP_CLIENT_2": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT1": "10.0.0.147", + "SNMP_COMMUNITY_STRING_CLIENT2": "10.0.0.147", + "BILLING_SERVER_1": "10.0.0.147", + "BILLING_SERVER_2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR1": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR2": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR3": "10.0.0.147", + "IMS_CORE_ALT_IP_ADDR4": "10.0.0.147", + "OAM_VIP_HOSTNAME": "10.0.0.147", + "DG_APP_SERVER1": "10.0.0.147", + "DG_APP_SERVER2": "10.0.0.147", + "CTS_IP_RANGE": "10.0.0.147", "CTS_PREFIX_LENGTH": "26", - "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", + "LICENSE_KEY": "abcd1234", "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml index 3eb302eb3..f065c3058 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/pd.yaml @@ -21,7 +21,7 @@ vnf-parameter-list: required: false source: "INSTAR" rule-type: null - default: "fd00:f4d5:ea06:1:0:110:136:254" + default: "10.0.0.147" request-keys: - key-name: "address_fqdn" key-value: "m001dbj001p1n004v006" @@ -52,7 +52,7 @@ vnf-parameter-list: required: false source: null rule-type: null - default: "fd00:f4d5:ea06:1:0:110:136:254" + default: "10.0.0.147" request-keys: null response-keys: null - name: "REMOTE_BILLING_IP_ADDR" diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml index cb9e332f5..3abb4fefb 100644 --- a/appc-directed-graph/dg-loader/provider/pom.xml +++ b/appc-directed-graph/dg-loader/provider/pom.xml @@ -164,41 +164,5 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - com.brocade.developer - - - providermodule-plugin - - - [1.2.0.100-SNAPSHOT,) - - - process - - - - - - - - - - - - diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java index d88958239..424a2d6cd 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java @@ -168,11 +168,6 @@ public class DGXMLLoadNActivate { "Sufficient inputs for DGXMLLoadNActivate are missing "); } - // propertyPath = - // "/Users/bs2796/0Source/ecomp/bvc-3.2.2/others/properties/dblib.properties"; - // xmlPath = DGXMLLoadNActivate.class.getClassLoader().getResource(".").getPath() - // +"/xml" ; - DGXMLLoadNActivate dgXMLLoadDB = new DGXMLLoadNActivate(propertyPath); dgXMLLoadDB.loadDGXMLDir(xmlPath); dgXMLLoadDB.activateDg(activateFile); diff --git a/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh b/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh index d12654282..b499b081d 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh +++ b/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh @@ -25,30 +25,38 @@ ### -export BVC_DIR=/opt/app/bvc -export DG_DIR=${BVC_DIR}/dg +### +### Convert XML DGs to JSON DGs using dg-loader, then load/activate them in the MySQL DB. ### +### + +export APPC_HOME=${APPC_HOME:-/opt/onap/appc} + +# SVCLOGIC_DIR env variable points to /opt/onap/appc/svclogic +export SVCLOGIC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" -if (( "$#" != 1 )) +#Path to the dg-loader jar file +export DG_LOADER=${APPC_HOME}/data/dg-loader-provider-jar-with-dependencies.jar + +# Check if the JSON Directory exists under the env. variable defined +export DG_JSON_DIR=${SVCLOGIC_DIR}/graphs/appc/json/dg-loader-dgs +echo "Processing DG JSON directory : ${DG_JSON_DIR}" +if [ ! -d "$DG_JSON_DIR" ] then - echo "DG JSON Directory is Missing" + echo "DG-Loader JSON Directory is Missing" exit 1 fi -export DG_JSON_DIR=$1 -echo "Processing DG JSON directory : ${DG_JSON_DIR}" cd ${DG_JSON_DIR} +mkdir -p ${DG_JSON_DIR}/converted-xml -###################################################################### -rm -rf ${DG_JSON_DIR}/xml - -################## To Genetare XML from JSON ######################## -$JAVA_HOME/bin/java -cp ${DG_DIR}/lib/dg-loader-provider.jar org.onap.sdnc.dg.loader.DGXMLGenerator ${DG_JSON_DIR} ${DG_JSON_DIR}/xml +# Generate XML DGs from JSON DGs +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLGenerator ${DG_JSON_DIR} ${DG_JSON_DIR}/converted-xml -################## To Load DG XML ######################## -$JAVA_HOME/bin/java -cp ${DG_DIR}/lib/dg-loader-provider.jar org.onap.sdnc.dg.loader.DGXMLLoad ${DG_JSON_DIR}/xml ${BVC_DIR}/properties/dblib.properties +# Load converted XML DGs to the SVC_LOGIC DB in the MySQL Docker Container +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLLoad ${DG_JSON_DIR}/converted-xml ${APPC_HOME}/data/properties/dblib.properties -################## To Activate ######################## -$JAVA_HOME/bin/java -cp ${DG_DIR}/lib/dg-loader-provider.jar org.onap.sdnc.dg.loader.DGXMLActivate ${DG_JSON_DIR}/dg_activate.txt ${BVC_DIR}/properties/dblib.properties +# Activate converted XML DGs to the SVC_LOGIC DB in the MySQL Docker Container +$JAVA_HOME/bin/java -cp ${DG_LOADER} org.onap.sdnc.dg.loader.DGXMLActivate ${DG_JSON_DIR}/dg_activate.txt ${APPC_HOME}/data/properties/dblib.properties exit 0 -- cgit 1.2.3-korg