From 13cd99b20365b23d1db641eb367456a961d89c33 Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 30 Nov 2018 19:13:06 +0100 Subject: [PATCH] Replace wrong name Replace wrong names in samples Issue-ID: CLAMP-252 Change-Id: I17dc8715ac1080c7f8823dc4903f0b68b9774067 Signed-off-by: sebdet --- src/test/resources/example/sdc/sdcAlarmsList.csv | 12 ++++---- .../example/sdc/sdcCVFCResourceExample.json | 2 +- .../resources/example/sdc/sdcCVFCResources.json | 2 +- .../resources/example/sdc/sdcCinderVolume.json | 2 +- .../example/sdc/sdcResourceDetailsExample.json | 2 +- .../resources/example/sdc/sdcSecurityRules.json | 2 +- .../example/sdc/sdcServiceDetailsExample.json | 34 +++++++++++----------- .../example/sdc/sdcVFCGenericWithAlarms.json | 2 +- .../example/sdc/sdcVFCResourceExample.json | 2 +- src/test/resources/example/sdc/sdcVFResources.json | 28 +++++++++--------- 10 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/test/resources/example/sdc/sdcAlarmsList.csv b/src/test/resources/example/sdc/sdcAlarmsList.csv index 247dcd9a..43ffdd34 100644 --- a/src/test/resources/example/sdc/sdcAlarmsList.csv +++ b/src/test/resources/example/sdc/sdcAlarmsList.csv @@ -1,13 +1,13 @@ ,EventSourceType,,AlarmCondition,Severity -eventType,VPMS,alarmCondition,SwRestart,CRITICAL +eventType,VNFNAME,alarmCondition,SwRestart,CRITICAL -eventType,VPMS,alarmCondition,SwRestart,WARNING +eventType,VNFNAME,alarmCondition,SwRestart,WARNING -eventType,VPMS,alarmCondition,SwRestart,OK +eventType,VNFNAME,alarmCondition,SwRestart,OK -eventType,VPMS,alarmCondition,IsAlive,CRITICAL +eventType,VNFNAME,alarmCondition,IsAlive,CRITICAL -eventType,VPMS,alarmCondition,IsAlive,WARNING +eventType,VNFNAME,alarmCondition,IsAlive,WARNING -eventType,VPMS,alarmCondition,IsAlive,OK +eventType,VNFNAME,alarmCondition,IsAlive,OK diff --git a/src/test/resources/example/sdc/sdcCVFCResourceExample.json b/src/test/resources/example/sdc/sdcCVFCResourceExample.json index 01998dcb..16ebe74d 100644 --- a/src/test/resources/example/sdc/sdcCVFCResourceExample.json +++ b/src/test/resources/example/sdc/sdcCVFCResourceExample.json @@ -10,7 +10,7 @@ "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "user", "lastUpdaterFullName": "Zero ASDCMech", - "toscaResourceName": "org.openecomp.resource.vfc.ClampDev.abstract.nodes.virc_fe_be_0", + "toscaResourceName": "org.onap.resource.vfc.ClampDev.abstract.nodes.virc_fe_be_0", "resources": [ { "resourceInstanceName": "virc_fe_be_virc_fe_be_management_0_port", diff --git a/src/test/resources/example/sdc/sdcCVFCResources.json b/src/test/resources/example/sdc/sdcCVFCResources.json index 54003a64..e8743bba 100644 --- a/src/test/resources/example/sdc/sdcCVFCResources.json +++ b/src/test/resources/example/sdc/sdcCVFCResources.json @@ -266,7 +266,7 @@ { "uuid": "cba89050-752c-4aac-8cec-6f0463eb8a23", "invariantUUID": "ac6fab25-abc6-4e0e-ba25-cc2ddd7a51ef", - "name": "LDSA-nodes.ltm", + "name": "VNF-nodes.ltm", "version": "1.0", "toscaModelURL": "/sdc/v1/catalog/resources/cba89050-752c-4aac-8cec-6f0463eb8a23/toscaModel", "category": "Generic", diff --git a/src/test/resources/example/sdc/sdcCinderVolume.json b/src/test/resources/example/sdc/sdcCinderVolume.json index 1832a9aa..776226c8 100644 --- a/src/test/resources/example/sdc/sdcCinderVolume.json +++ b/src/test/resources/example/sdc/sdcCinderVolume.json @@ -10,6 +10,6 @@ "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "user", "lastUpdaterFullName": "Jimmy Hendrix", - "toscaResourceName": "org.openecomp.resource.vfc.nodes.heat.cinder.Volume", + "toscaResourceName": "org.onap.resource.vfc.nodes.heat.cinder.Volume", "description": "Represents a server-local block storage device that provides persistent storage to guest virtual machines. " } \ No newline at end of file diff --git a/src/test/resources/example/sdc/sdcResourceDetailsExample.json b/src/test/resources/example/sdc/sdcResourceDetailsExample.json index 7653b948..16c5708f 100644 --- a/src/test/resources/example/sdc/sdcResourceDetailsExample.json +++ b/src/test/resources/example/sdc/sdcResourceDetailsExample.json @@ -10,7 +10,7 @@ "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "user", "lastUpdaterFullName": "Three ASDCMech", - "toscaResourceName": "org.openecomp.resource.vf.ClampDev", + "toscaResourceName": "org.onap.resource.vf.ClampDev", "resources": [ { diff --git a/src/test/resources/example/sdc/sdcSecurityRules.json b/src/test/resources/example/sdc/sdcSecurityRules.json index b73abb05..a7a64123 100644 --- a/src/test/resources/example/sdc/sdcSecurityRules.json +++ b/src/test/resources/example/sdc/sdcSecurityRules.json @@ -10,6 +10,6 @@ "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "user", "lastUpdaterFullName": "Jimmy Hendrix", - "toscaResourceName": "org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules", + "toscaResourceName": "org.onap.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules", "description": "Configuration of policy rules to be applied on ports." } \ No newline at end of file diff --git a/src/test/resources/example/sdc/sdcServiceDetailsExample.json b/src/test/resources/example/sdc/sdcServiceDetailsExample.json index b344f419..57232503 100644 --- a/src/test/resources/example/sdc/sdcServiceDetailsExample.json +++ b/src/test/resources/example/sdc/sdcServiceDetailsExample.json @@ -10,7 +10,7 @@ "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "user", "lastUpdaterFullName": "MONICA LAZER", - "toscaResourceName": "org.openecomp.resource.vf.Vcts3", + "toscaResourceName": "org.onap.resource.vf.Vcts3", "resources": [ { @@ -79,11 +79,11 @@ { "artifactChecksum": "CheckSum", - "artifactDescription": "Nimbus Heat OAM", - "artifactName": "hot-nimbus-oam_v1.0.yaml", + "artifactDescription": "Test desc", + "artifactName": "vnf_v1.0.yaml", "artifactTimeout": 100, "artifactType": "HEAT", - "artifactURL": "hot-nimbus-oam_v1.0.yaml", + "artifactURL": "vnf_v1.0.yaml", "artifactUUID": "Artifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "EnvArtifact-UUID2", @@ -96,10 +96,10 @@ { "artifactChecksum": "CheckSum", - "artifactDescription": "Nimbus Heat ENV OAM", - "artifactName": "hot-nimbus-oam_v1.0.env", + "artifactDescription": "Vnf desc", + "artifactName": "vnf_v1.0.env", "artifactType": "HEAT_ENV", - "artifactURL": "hot-nimbus-oam_v1.0.env", + "artifactURL": "vnf_v1.0.env", "artifactUUID": "EnvArtifact-UUID2", "artifactVersion": "1.0" }, @@ -128,11 +128,11 @@ { "artifactChecksum": "CheckSum", - "artifactDescription": "Script for Nimbus", - "artifactName": "cloud-nimbus.sh", + "artifactDescription": "Script for Vnf", + "artifactName": "cloud-Vnf.sh", "artifactType": "HEAT_ARTIFACT", - "artifactURL": "cloud-nimbus.sh", - "artifactUUID": "ScriptNimbusArtifact-UUID1", + "artifactURL": "cloud-Vnf.sh", + "artifactUUID": "ScriptVnfArtifact-UUID1", "artifactVersion": "1.0" }, @@ -149,10 +149,10 @@ { "artifactChecksum": "CheckSum", "artifactDescription": "Heat Vol for OAM", - "artifactName": "hot-nimbus-oam-volumes_v1.0.yaml", + "artifactName": "vnf-volumes_v1.0.yaml", "artifactTimeout": 10, "artifactType": "HEAT_VOL", - "artifactURL": "hot-nimbus-oam-volumes_v1.0.yaml", + "artifactURL": "vnf-volumes_v1.0.yaml", "artifactUUID": "VolumeArtifact-UUID1", "artifactVersion": "1.0", "generatedArtifact": "VolumeEnvArtifact-UUID1", @@ -165,9 +165,9 @@ { "artifactChecksum": "CheckSum", "artifactDescription": "Heat Env Vol for OAM", - "artifactName": "hot-nimbus-oam-volumes_v1.0.env", + "artifactName": "vnf-volumes_v1.0.env", "artifactType": "HEAT_ENV", - "artifactURL": "hot-nimbus-oam-volumes_v1.0.env", + "artifactURL": "vnf-volumes_v1.0.env", "artifactUUID": "VolumeEnvArtifact-UUID1", "artifactVersion": "1.0" }, @@ -175,10 +175,10 @@ { "artifactChecksum": "CheckSum", "artifactDescription": "Meta data for VFModule", - "artifactName": "att_nimbus_vsaegw_ht_base_v13_0728v1.yaml", + "artifactName": "vnf_1.yaml", "artifactTimeout": 100, "artifactType": "HEAT", - "artifactURL": "att_nimbus_vsaegw_ht_base_v13_0728v1.yaml", + "artifactURL": "vnf_1.yaml", "artifactUUID": "HeatArtifactE2E-UUIDTest", "artifactVersion": "1.0" } diff --git a/src/test/resources/example/sdc/sdcVFCGenericWithAlarms.json b/src/test/resources/example/sdc/sdcVFCGenericWithAlarms.json index 952650af..5534d992 100644 --- a/src/test/resources/example/sdc/sdcVFCGenericWithAlarms.json +++ b/src/test/resources/example/sdc/sdcVFCGenericWithAlarms.json @@ -10,7 +10,7 @@ "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "user", "lastUpdaterFullName": "Zero ASDCMech", - "toscaResourceName": "org.openecomp.resource.vfc.ClampDev.abstract.nodes.virc_fe_be_1", + "toscaResourceName": "org.onap.resource.vfc.ClampDev.abstract.nodes.virc_fe_be_1", "resources": [ { diff --git a/src/test/resources/example/sdc/sdcVFCResourceExample.json b/src/test/resources/example/sdc/sdcVFCResourceExample.json index 5f523e6b..0b0d5811 100644 --- a/src/test/resources/example/sdc/sdcVFCResourceExample.json +++ b/src/test/resources/example/sdc/sdcVFCResourceExample.json @@ -10,7 +10,7 @@ "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "user", "lastUpdaterFullName": "Zero ASDCMech", - "toscaResourceName": "org.openecomp.resource.vfc.Clampdev.abstract.nodes.heat.virc_fe_be", + "toscaResourceName": "org.onap.resource.vfc.Clampdev.abstract.nodes.heat.virc_fe_be", "artifacts": [ { "artifactName": "Fault-alarms-ASDC-vprobes-vLB.csv", diff --git a/src/test/resources/example/sdc/sdcVFResources.json b/src/test/resources/example/sdc/sdcVFResources.json index 4274ba8f..e9d1d3b8 100644 --- a/src/test/resources/example/sdc/sdcVFResources.json +++ b/src/test/resources/example/sdc/sdcVFResources.json @@ -483,7 +483,7 @@ { "uuid": "6b934b9d-0785-4b46-8321-943a12b8031b", "invariantUUID": "785012c2-fdd8-450d-8fa2-81ff60e25f1e", - "name": "vMMSC_AIC3.0__multi_members_multi_groups_volume.cs", + "name": "VNFNAME__multi_members_multi_groups_volume.cs", "version": "0.2", "toscaModelURL": "/sdc/v1/catalog/resources/6b934b9d-0785-4b46-8321-943a12b8031b/toscaModel", "category": "Application L4+", @@ -574,7 +574,7 @@ { "uuid": "c8663b6e-bbe2-401d-9500-ec5425463655", "invariantUUID": "925243cf-e342-4d86-8558-63899fbe88da", - "name": "VF Module LDSA", + "name": "VF Module VNF", "version": "1.1", "toscaModelURL": "/sdc/v1/catalog/resources/c8663b6e-bbe2-401d-9500-ec5425463655/toscaModel", "category": "Application L4+", @@ -665,7 +665,7 @@ { "uuid": "c1c02cff-855f-438e-85f8-40c362874896", "invariantUUID": "64cb5201-90d4-4cab-a6a9-f7416eeb307f", - "name": "PXTC", + "name": "VNFName", "version": "0.1", "toscaModelURL": "/sdc/v1/catalog/resources/c1c02cff-855f-438e-85f8-40c362874896/toscaModel", "category": "Application L4+", @@ -678,7 +678,7 @@ { "uuid": "837c2fee-c2b2-4e95-ad48-dd69772d99bd", "invariantUUID": "e48b3ea8-39bc-41eb-84bf-f5ef267d31e4", - "name": "vMOG VNF 1", + "name": "VNF 1", "version": "0.1", "toscaModelURL": "/sdc/v1/catalog/resources/837c2fee-c2b2-4e95-ad48-dd69772d99bd/toscaModel", "category": "Network L2-3", @@ -756,7 +756,7 @@ { "uuid": "1e7f07c7-ff4c-40a6-95f6-a9b05f138027", "invariantUUID": "cfff70d2-f942-4b25-b2ca-e64f64af511d", - "name": "vMMSC_AIC3.0__multi_members_multi_groups_volume", + "name": "VNFNAME__multi_members_multi_groups_volume", "version": "2.0", "toscaModelURL": "/sdc/v1/catalog/resources/1e7f07c7-ff4c-40a6-95f6-a9b05f138027/toscaModel", "category": "Application L4+", @@ -938,7 +938,7 @@ { "uuid": "c9ea2798-f3ba-4826-ae93-0786820cb890", "invariantUUID": "5882c528-76fe-4884-90c7-71301ca52cf8", - "name": "vMMSC_ECA", + "name": "VNFNAME1", "version": "0.1", "toscaModelURL": "/sdc/v1/catalog/resources/c9ea2798-f3ba-4826-ae93-0786820cb890/toscaModel", "category": "Application L4+", @@ -1016,7 +1016,7 @@ { "uuid": "3951e021-7595-43b1-a6fd-de077c01af54", "invariantUUID": "925243cf-e342-4d86-8558-63899fbe88da", - "name": "VF Module LDSA", + "name": "VF Module VNF", "version": "1.0", "toscaModelURL": "/sdc/v1/catalog/resources/3951e021-7595-43b1-a6fd-de077c01af54/toscaModel", "category": "Application L4+", @@ -1068,7 +1068,7 @@ { "uuid": "70974b30-6b89-41d2-8b5d-779279db3b96", "invariantUUID": "725e5fd1-2520-4669-a5f2-23f9ad2fbec4", - "name": "vSCP0502", + "name": "VnfName2", "version": "1.0", "toscaModelURL": "/sdc/v1/catalog/resources/70974b30-6b89-41d2-8b5d-779279db3b96/toscaModel", "category": "Application L4+", @@ -1081,7 +1081,7 @@ { "uuid": "c9e436c3-539f-45e2-90b4-b046af907877", "invariantUUID": "bc7fe896-e286-41cb-a11f-7081fc92876b", - "name": "vMMSC", + "name": "VNFNAME", "version": "0.1", "toscaModelURL": "/sdc/v1/catalog/resources/c9e436c3-539f-45e2-90b4-b046af907877/toscaModel", "category": "Application L4+", @@ -1120,7 +1120,7 @@ { "uuid": "82460d6a-1cd7-4c57-bc89-625600555f80", "invariantUUID": "c67108d4-a0b0-4eee-8fbc-c881d7bb21d3", - "name": "VF modules vMMSC", + "name": "VF modules VNFNAME", "version": "1.0", "toscaModelURL": "/sdc/v1/catalog/resources/82460d6a-1cd7-4c57-bc89-625600555f80/toscaModel", "category": "Application L4+", @@ -1172,7 +1172,7 @@ { "uuid": "ac603264-cdf7-49ab-a9ae-92d341023218", "invariantUUID": "379ab526-dc81-4b31-b60d-31c1805ddf5a", - "name": "FDNT1", + "name": "VnfName1", "version": "0.1", "toscaModelURL": "/sdc/v1/catalog/resources/ac603264-cdf7-49ab-a9ae-92d341023218/toscaModel", "category": "Application L4+", @@ -1237,7 +1237,7 @@ { "uuid": "44ff8000-e703-4538-b26a-f2bc8205d7d4", "invariantUUID": "26badc5a-d29e-4583-b773-0d42366a8bb1", - "name": "FDNT1234", + "name": "VnfName1234", "version": "1.0", "toscaModelURL": "/sdc/v1/catalog/resources/44ff8000-e703-4538-b26a-f2bc8205d7d4/toscaModel", "category": "Network L2-3", @@ -1315,7 +1315,7 @@ { "uuid": "8dec3b8a-a0fa-4634-bbb4-d7bad5a912ab", "invariantUUID": "eda652e4-6740-46bf-8d0f-92c4752070f6", - "name": "FCGI_OS", + "name": "VNFNAME", "version": "0.1", "toscaModelURL": "/sdc/v1/catalog/resources/8dec3b8a-a0fa-4634-bbb4-d7bad5a912ab/toscaModel", "category": "Application L4+", @@ -1419,7 +1419,7 @@ { "uuid": "da3619c1-9b19-4edc-9853-a714c5034371", "invariantUUID": "b90f7990-667a-4f63-9e7f-ee02f64766f1", - "name": "FDNT", + "name": "VnfName2", "version": "0.1", "toscaModelURL": "/sdc/v1/catalog/resources/da3619c1-9b19-4edc-9853-a714c5034371/toscaModel", "category": "Application L4+", -- 2.16.6