aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp
diff options
context:
space:
mode:
authorAviZi <avi.ziv@amdocs.com>2017-06-09 02:39:56 +0300
committerAviZi <avi.ziv@amdocs.com>2017-06-09 02:39:56 +0300
commit280f8015d06af1f41a3ef12e8300801c7a5e0d54 (patch)
tree9c1d3978c04cd28068f02073038c936bb49ca9e0 /openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp
parentfd3821dad11780d33c5373d74c957c442489945e (diff)
[SDC-29] Amdocs OnBoard 1707 initial commit.
Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi <avi.ziv@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp')
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.yaml18
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.yaml21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.yaml25
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.yaml37
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.yaml37
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.yaml52
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.yaml58
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.yaml43
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.yaml41
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.yaml37
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.yaml27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.yaml43
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.yaml57
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.yaml40
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.yaml39
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.yaml28
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.yaml33
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/firstVol.yaml19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/firstVol.yaml1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/second.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/MANIFEST.json27
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/firstVol.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/second.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/expected_output/expected_output.json38
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.env12
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/expected_output/expected_output.json34
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.env12
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.yaml71
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/expected_output/expected_output.json42
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.env12
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.yaml128
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/expected_output/expected_output.json50
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.env12
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.yaml138
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.yaml60
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/MANIFEST.json11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/hot-nimbus-pps_v1.0.yaml43
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.env12
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml54
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.env3
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.yaml122
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/MANIFEST.json35
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.yaml50
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/MANIFEST.json21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml72
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/nested-psm_v1.0.yaml103
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml204
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-psm_v1.0.yaml103
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/MANIFEST.json21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.yaml55
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/MANIFEST.json11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/hot-nimbus-pps_v1.0.yaml31
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/MANIFEST.json11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/hot-nimbus-psm_v1.0.yaml52
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.yaml69
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/MANIFEST.json45
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.yaml56
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-points-to-hot-nimbus-psm.yaml60
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-psm_v1.0.yaml47
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/yaml-point-to-itself.yaml21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.yaml92
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.yaml236
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.yaml95
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.yaml233
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/expected_output/expected_output.json42
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-pps_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-psm_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.env8
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.yaml116
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-pps_v1.0.yaml114
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-psm_v1.0.yaml112
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-pps_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-psm_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-pps_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-psm_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/MANIFEST.json21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml49
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/nested-pps_v1.0.yaml74
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/MANIFEST.json11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/pseudo_parameters.yml61
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/MANIFEST.json11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/hot-nimbus-pps_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/artifact.sh99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/cloud-nimbus.sh99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.yaml212
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-pps_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-psm_v1.0.yaml99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nimbus-ethernet99
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/MANIFEST.json11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/hot-nimbus-psm_v1.0.yaml102
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/yamlFile.yaml47
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/MANIFEST.json15
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml16
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml121
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/MANIFEST.json19
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-pps_v1.0.yaml59
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml98
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-from-resources-group.yaml105
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-pps_v1.0.yaml52
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml144
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml288
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-from-resources-group.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/baseFile.yaml43
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/notBaseFile.yaml26
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.yaml68
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.yaml67
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.yaml70
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/MANIFEST.json51
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.yaml144
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.yaml199
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-pps_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-psm_v1.0.yaml97
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.yaml90
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/MANIFEST.json35
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.env11
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.yaml125
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.yaml207
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-pps_v1.0.yaml103
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-psm_v1.0.yaml103
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/expected_output/expected_output.json1
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/MANIFEST.json17
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.env10
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.yaml50
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/MANIFEST.json22
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.yaml14
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/second.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/MANIFEST.json24
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/illegalTypeFile.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.env.illegalSuffix0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.yaml.illegalSuffix0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/singleVol.yaml.illegalSuffix0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/MANIFEST.json21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/singleVol.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/MANIFEST.json22
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/extraFile.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/singleVol.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/MANIFEST.json21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/extraFile.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/MANIFEST.json21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/MANIFEST.json21
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.env0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/singleVol.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidTabYamlStructure.yaml24
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml30
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/MANIFEST.json39
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/heat_missing_from_manifast.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/mainValid.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/validHeat.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/expected_output/expected_output.json46
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/MANIFEST.json39
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/heat_missing_from_manifast.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_additionalSpaceBeforeProperty.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_duplicateKey.yaml25
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_empty.yml0
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_yamlInXMLFormat.yaml4
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/validHeat.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/MANIFEST.json39
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/heat_missing_from_manifast.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/mainValid.yaml250
-rw-r--r--openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml250
441 files changed, 0 insertions, 20330 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.yaml
deleted file mode 100644
index 368834e847..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- SecurityGroup_expose:
- type: OS::Neutron::Net
-
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_param: ServerGroup_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.yaml
deleted file mode 100644
index 08955562d4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- net_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: net_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetwork/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.yaml
deleted file mode 100644
index f5c6b598cc..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/first.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- net_expose:
- type: OS::Neutron::Net
- volume_expose:
- type: OS::Cinder::Volume
-
-
-
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_param: ServerGroup_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.yaml
deleted file mode 100644
index 0c7abd6d49..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/first.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- net_expose:
- type: OS::Neutron::Net
- volume_expose:
- type: OS::Cinder::Volume
-
-
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: net_expose }
- expose_resource_volume_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeNetworkAndVolume/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.yaml
deleted file mode 100644
index fe5effbc24..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- SecurityGroup_expose:
- type: OS::Neutron::SecurityGroup
-
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_param: ServerGroup_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.yaml
deleted file mode 100644
index 781bcba716..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- SecurityGroup_expose:
- type: OS::Neutron::SecurityGroup
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: SecurityGroup_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeSecurityGroup/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.yaml
deleted file mode 100644
index 5660cc003b..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- ServerGroup_expose:
- type: OS::Nova::ServerGroup
-
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_param: ServerGroup_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.yaml
deleted file mode 100644
index 89fafb9d3a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- serverGroup_expose:
- type: OS::Nova::ServerGroup
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: serverGroup_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeServerGroup/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.yaml
deleted file mode 100644
index e2a4301249..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
-
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_param: volume_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.yaml
deleted file mode 100644
index 63b576edb8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/baseHeatDoesNotExposeVolume/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.yaml
deleted file mode 100644
index 3d3a1949b1..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/first.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- FSB2:
- type: OS::Neutron::FloatingIP
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2-flavor }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.yaml
deleted file mode 100644
index 2fc2a932fe..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/first.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- FSB2_Internal1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_id }
- FSB2_Internal2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal2_net_name }
- FSB2_OAM:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal3_net_id }
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatFloatingIpResourceType/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.yaml
deleted file mode 100644
index 5d6cea4d84..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/first.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- FSB2_Internal1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_id }
- FSB2_Internal2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal2_net_id }
- FSB2_OAM:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_name }
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.yaml
deleted file mode 100644
index 2c9fd08fb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/first.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- FSB2_Internal1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_id }
- FSB2_Internal2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal2_net_name }
- FSB2_OAM:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal3_net_id }
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-
- FSB3:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaNetworkUniqueRoleConvention/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.yaml
deleted file mode 100644
index 60f8c45630..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/first.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_4 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_a }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-
- FSB3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone}
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-
- FSB4:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_blabla}
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output2:
- description: the pcrf_server
- value: { get_resource: FSB2 }
- expose_resource_nove_output3:
- description: the pcrf_server
- value: { get_resource: FSB3 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.yaml
deleted file mode 100644
index 372761514f..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/first.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
-
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_4 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
- FSB3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output2:
- description: the pcrf_server
- value: { get_resource: FSB2 }
- expose_resource_nove_output3:
- description: the pcrf_server
- value: { get_resource: FSB3 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerAvailabilityZoneName/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.yaml
deleted file mode 100644
index 58e645e168..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/first.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2-flavor }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-
- FSB3:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- image: { get_param: fsb2-image }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-
-outputs:
- expose_resource_nove_output:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.yaml
deleted file mode 100644
index 2fc2a932fe..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/first.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- FSB2_Internal1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_id }
- FSB2_Internal2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal2_net_name }
- FSB2_OAM:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal3_net_id }
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VNF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerImageAndFlavor/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.yaml
deleted file mode 100644
index d82e1ee2d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/first.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
-
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- not_VF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output_1:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.yaml
deleted file mode 100644
index 85bb15837b..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/first.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
-
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: fsb_name_2 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output:
- description: the pcrf_server
- value: { get_resource: FSB2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerMetaDataValidation/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.yaml
deleted file mode 100644
index 3a8e71939f..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/first.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
-
- FSB2:
- type: OS::Nova::Server
- properties:
- name: {get_param: pcrf_pps_server_4}
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
- FSB3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server, 0] }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output2:
- description: the pcrf_server
- value: { get_resource: FSB2 }
- expose_resource_nove_output3:
- description: the pcrf_server
- value: { get_resource: FSB3 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.yaml
deleted file mode 100644
index 13fc942865..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/first.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
-
- FSB2:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_4 }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
- FSB3:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
- FSB4:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, {get_param: index_num}] }
- block_device_mapping: [{device_name: "vda", volume_id : {get_param: VMME_FSB2_boot_volume }, delete_on_termination: "false" }]
- flavor: { get_param: fsb2_flavor_name }
- availability_zone: { get_param: availability_zone_0 }
- metadata:
- VnF_id: { get_param: vnfvfVF_id }
- vf_module_id: { get_param: vf_module_id }
- networks:
- - port: { get_resource: FSB2_Internal1 }
- - port: { get_resource: FSB2_Internal2 }
- - port: { get_resource: FSB2_OAM }
-outputs:
- expose_resource_nove_output2:
- description: the pcrf_server
- value: { get_resource: FSB2 }
- expose_resource_nove_output3:
- description: the pcrf_server
- value: { get_resource: FSB3 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatNovaServerNameValidation/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.yaml
deleted file mode 100644
index 85a4c58334..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/first.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- port_resource_0:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_id }
- fixed_ips:
- - ip_address: {get_param: pcrf_net_ips}
- - ip_address: {get_param: pcrf_net_v6_ip_a}
- port_resource_1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_name }
- fixed_ips:
- - ip_address: {get_param: pcrf_net_v6_ips}
- - ip_address: { "Fn::Select" : [ { get_param: indx }, { get_param: [{ get_param: mvs_mgmt_ip_0 }] } ] }
- port_resource_2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_fqdn }
- fixed_ips:
- - ip_address: {get_param: pcrf_net_ipz}
- - ip_address: {get_param: pcrf_net_v6_ip_4}
- - ip_address": {get_param: pcrf_net_v0_ip_3}
-
-outputs:
- expose_resource_port_output_0:
- description: the pcrf_server
- value: { get_resource: port_resource_0 }
- expose_resource_port_output_1:
- description: the pcrf_server
- value: { get_resource: port_resource_1 }
- expose_resource_port_output_2:
- description: the pcrf_server
- value: { get_resource: port_resource_2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.yaml
deleted file mode 100644
index 7e0aaa373d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/first.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- port_resource_0:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_id }
- fixed_ips:
- - ip_address: {get_param: pcrf_net_ips}
-
- port_resource_1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_name }
- fixed_ips:
- - ip_address: {get_param: pcrf_net_v6_ips}
-
- port_resource_2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_fqdn }
- fixed_ips:
- - ip_address: {get_param: pcrf_net_ip_4}
- - ip_address: {get_param: pcrf_net_v6_ip_4}
-
-outputs:
- expose_resource_port_output_0:
- description: the pcrf_server
- value: { get_resource: port_resource_0 }
- expose_resource_port_output_1:
- description: the pcrf_server
- value: { get_resource: port_resource_1 }
- expose_resource_port_output_2:
- description: the pcrf_server
- value: { get_resource: port_resource_2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortFixedIpNamingConvention/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.yaml
deleted file mode 100644
index abbf650c8d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/first.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- port_resource:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: not_valid_network_name }
- port_resource_1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: not_valid_net }
- port_resource_2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: not_valid_net_id_error }
- port_resource_3:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: }
-
-outputs:
- expose_resource_port_output:
- description: the pcrf_server
- value: { get_resource: port_resource }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.yaml
deleted file mode 100644
index c6128e9470..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/first.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- port_resource_0:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_id }
-resources:
- port_resource_1:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_name }
-resources:
- port_resource_2:
- type: OS::Neutron::Port
- properties:
- network_id: { get_param: Internal1_net_fqdn }
-
-
-outputs:
- expose_resource_port_output_0:
- description: the pcrf_server
- value: { get_resource: port_resource_0 }
-expose_resource_port_output_1:
- description: the pcrf_server
- value: { get_resource: port_resource_1 }
-expose_resource_port_output_2:
- description: the pcrf_server
- value: { get_resource: port_resource_2 }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatPortNetworkNamingConvention/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.yaml
deleted file mode 100644
index 3173885d7e..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
-
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/firstVol.yaml
deleted file mode 100644
index 4f0d65a735..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_param: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/negative/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/MANIFEST.json
deleted file mode 100644
index 76ce6de6e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.yaml
deleted file mode 100644
index 63b576edb8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/firstVol.yaml
deleted file mode 100644
index 7e82b2a7e6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/firstVol.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-heat_template_version: 2013-05-23
-
-parameters:
- not_null:
- type: number
- label: not_number
-
-
-resources:
- volume_expose:
- type: OS::Cinder::Volume
- properties:
- not_null: not_null
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: volume_expose }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/heatVolumeExpose/positive/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/MANIFEST.json
deleted file mode 100644
index a189124e6c..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": false,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/firstVol.yaml
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/firstVol.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/second.yaml
deleted file mode 100644
index bb06b9d60a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/missingBaseHeat/second.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat second
-
-resources:
- network_expose:
- type: OS::Neutron::Net
-
-outputs:
- expose_resource_network_output:
- description: the pcrf_server
- value: { get_resource: network_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/MANIFEST.json
deleted file mode 100644
index 3de70a21df..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/MANIFEST.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "firstVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- },
- {
- "file": "second.yaml",
- "type": "HEAT",
- "isBase": true
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/first.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/firstVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/firstVol.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/firstVol.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/second.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/second.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecompGuideLineValidator/multiBaseHeat/second.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/expected_output/expected_output.json
deleted file mode 100644
index e9106a850c..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/expected_output/expected_output.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "hot-nimbus-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Server Availability Zone not aligned with Guidelines, Resource ID [availability_zone_illegal_name_1]"
- },
- {
- "level": "WARNING",
- "message": "Server Availability Zone not aligned with Guidelines, Resource ID [availability_zone_illegal_name_2]"
- }
- ]
- },
- "nested-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
- }
- ]
- },
- "MANIFEST.json": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
- }
- ]
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 809835d2b8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
- mock_param: abskdjska
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 1b865e75d5..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/availability_zone_name/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- default: True
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- availability_zone_1:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-
-resources:
-
-
- availability_zone_legal_name_1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- availability_zone: {get_param: availability_zone_1}
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- availability_zone_legal_name_2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- availability_zone: {get_resource: availability_zone_1}
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- availability_zone_illegal_name_1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- availability_zone: {get_param: availability_zone_name}
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- availability_zone_illegal_name_2:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- availability_zone: {get_param: availability_zone}
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/expected_output/expected_output.json
deleted file mode 100644
index f0dc0d21a1..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/expected_output/expected_output.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "hot-nimbus-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "OS::Neutron::FloatingIP is in use, Resource ID [floating_ip_type]"
- }
- ]
- },
- "nested-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
- }
- ]
- },
- "MANIFEST.json": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
- }
- ]
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 809835d2b8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
- mock_param: abskdjska
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05724cf55b..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/floating_ip_resource_type/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- default: True
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- availability_zone_1:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-
-resources:
- legal_resource_type1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- availability_zone: {get_param: availability_zone_1}
- flavor: {get_param: pcrf_flavor_name}
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- floating_ip_type:
- type: OS::Neutron::FloatingIP
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- availability_zone: {get_param: availability_zone_name}
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/expected_output/expected_output.json
deleted file mode 100644
index 7eefd3d36e..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/expected_output/expected_output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "hot-nimbus-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_1]"
- },
- {
- "level": "WARNING",
- "message": "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_2]"
- },
- {
- "level": "WARNING",
- "message": "Fixed_IPS not aligned with Guidelines, Resource ID [fixed_ip_illegal_name_3]"
- }
- ]
- },
- "nested-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
- }
- ]
- },
- "MANIFEST.json": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
- }
- ]
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 809835d2b8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
- mock_param: abskdjska
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 749b7144b6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/neutron_port_fixed_ip_name/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,128 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- default: True
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_net_ips:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_net_v6_ips:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_net_ip_4:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_net_v6_ip_4:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_net_ipz:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_net_v0_ip_3:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_net_v6_ip_a:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
-
- fixed_ip_legal_name_1:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address: {get_param: pcrf_net_ips}
-
- fixed_ip_legal_name_2:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address: {get_param: pcrf_net_v6_ips}
-
- fixed_ip_legal_name_3:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address: {get_param: pcrf_net_ip_4}
-
- fixed_ip_legal_name_4:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address: {get_param: pcrf_net_v6_ip_4}
-
- fixed_ip_legal_name_5:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address: {get_resource: pcrf_net_v6_ip_4}
-
- fixed_ip_illegal_name_1:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address: {get_param: pcrf_net_ipz}
-
- fixed_ip_illegal_name_2:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address": {get_param: pcrf_net_v0_ip_3}
-
- fixed_ip_illegal_name_3:
- type: OS::Neutron::Port
- properties:
- name: {get_param: pcrf_pps_image_name}
- fixed_ips:
- - ip_address: {get_param: pcrf_net_v6_ip_a}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/expected_output/expected_output.json
deleted file mode 100644
index ca1f58c1f8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/expected_output/expected_output.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "hot-nimbus-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_1]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_2]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_3]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_4]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [nova_server_ilegal_name_5]"
- }
- ]
- },
- "nested-pps_v1.0.yaml": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing VF_MODULE_ID resource id [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Server Name not aligned with Guidelines, Resource ID [pcrf_server_pps]"
- },
- {
- "level": "WARNING",
- "message": "Fixed_IPS not aligned with Guidelines, Resource ID [pcrf_pps_port_0]"
- }
- ]
- },
- "MANIFEST.json": {
- "errorMessageList": [
- {
- "level": "WARNING",
- "message": "Missing Base HEAT. Pay attention that without Base HEAT, there will be no shared resources"
- }
- ]
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 809835d2b8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
- mock_param: abskdjska
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 766cbf150f..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/ecomp_naming_convention/nova_server_name/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- default: True
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_vnf_module_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_flavor:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_pps_server_name_4:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-
-resources:
- nova_server_legal_name_1:
- type: OS::Nova::Server
- properties:
- name: { get_param: [pcrf_pps_server_names, 0] }
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
-
- nova_server_legal_name_2:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_4 }
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- nova_server_legal_name_3:
- type: OS::Nova::Server
- properties:
- name: { get_resource: pcrf_pps_server_name_4 }
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- nova_server_ilegal_name_1:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_a }
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- nova_server_ilegal_name_2:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_nameds_a }
- flavor: { get_param: pcrf_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- nova_server_ilegal_name_3:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_a }
- flavor: { get_param: pcrf_pps_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- nova_server_ilegal_name_4:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_a }
- flavor: { get_param: pcrf_pps_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- nova_server_ilegal_name_5:
- type: OS::Nova::Server
- properties:
- name: { get_param: pcrf_pps_server_name_a }
- flavor: { get_param: pcrf_pps_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
-
- nova_server_ilegal_name_6:
- type: OS::Nova::Server
- properties:
- name: pcrf_pps_server_name_a
- flavor: { get_param: pcrf_pps_flavor_name }
- metadata:
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_module_id }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 8ae6fc021a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name_1: 14
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 555f6ae852..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/default_value_align_with_type/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name_1:
- type: number
- default: True
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_image_name_2:
- type:
- default: True
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_image_name_3:
- type: number
- default:
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: OS::Heat::CloudConfig
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/MANIFEST.json
deleted file mode 100644
index a1ec6bc0f7..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/MANIFEST.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 35a0efb28d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/depends_on_points_to_existing_resource/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
-
-resources:
- resource_depends_on_legal_1:
- type: OS::Heat::CloudConfig
- depends_on: [resource_1, resource_2]
-
- resource_depends_on_legal_2:
- type: OS::Heat::CloudConfig
- depends_on: resource_1
-
- resource_depends_on_illegal_1:
- type: OS::Heat::CloudConfig
- depends_on: resource_not_exist
-
- resource_depends_on_illegal_2:
- type: OS::Heat::CloudConfig
- depends_on: [resource_1, resource_3]
-
- resource_depends_on_illegal_3:
- type: OS::Heat::CloudConfig
- depends_on:
-
- resource_1:
- type: OS::Heat::CloudConfig
-
- resource_2:
- type: OS::Heat::CloudConfig
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 809835d2b8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,12 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
- mock_param: abskdjska
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 4605195eaf..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_psm_server_name:
- type: string
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_content_is_subset_of_heat/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/MANIFEST.json
deleted file mode 100644
index d383ab6c95..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "env_empty_value.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "env_empty_value.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.env
deleted file mode 100644
index 20f9eed60d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.env
+++ /dev/null
@@ -1,3 +0,0 @@
-parameters:
- oam_mgmt_network_id: e1724ea7-553b-470d-a9eb-ed274528a0a1
- cluster_size:
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.yaml
deleted file mode 100644
index 9d01d63908..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_empty_value/input/env_empty_value.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-heat_template_version: 2014-10-16
-
-description: create BIG-IP VE instance
-
-parameters:
-
- # 06-01-2015 added anti-affinity policy
- lb_server_group:
- type: string
- description: Anti-affinity group for lb
- server_name:
- type: comma_delimited_list
- label: BIG-IP instance name
- description: BIG-IP instance name
- image_name:
- type: string
- label: image name
- description: the MVM BIG-IP image name
- flavor_name:
- type: string
- label: bigip flavor name
- description: the flavor name of bigip instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: the availabilityzone name
- security_group_name:
- type: string
- label: security group name
- description: the name of security group
- oam_mgmt_network_id:
- type: string
- label: oam network name
- description: mgmt eth0 local mgmt network
- oam_mgmt_network_ip:
- type: comma_delimited_list
- label: oam network ip
- description: the local ip of mgmt network
- oam_network_id:
- type: string
- label: bigip oam network id
- description: oam TMM 1.1 network
- oam_network_ip:
- type: comma_delimited_list
- label: oam network ip
- description: the local ip of oam network
- oam_network_vip_ip:
- type: string
- label: oam network virtual server ip
- description: oam network virtual server ip
- dmz_network_id:
- type: string
- label: bigip dmz network id
- description: dmz TMM 1.2 network
- dmz_network_ip:
- type: comma_delimited_list
- label: dmz network ip
- description: BIGIP dmz network ip
- dmz_network_vip_ip:
- type: string
- label: dmz network virtual server ip
- description: dmz network virtual server ip
- core_network_id:
- type: string
- label: core network id
- description: core TMM 1.3 network
- core_network_ip:
- type: comma_delimited_list
- label: core network ip
- description: core network ip
- core_network_vip_ip:
- type: string
- label: core network virtual server ip
- description: core network virtual server ip
- ha_network_f5_id:
- type: string
- label: HA network id
- description: HA TMM 1.4 network
- ha_local_ip:
- type: comma_delimited_list
- label: HA local ip
- description: HA failover local ip
- vnf_id:
- type: string
- description: Unique ID for this VF instance
- vf_module_id:
- type: string
- description: Unique ID for this VF_MODULE instance
- cluster_size:
- type: number
- description: number of instance of the VF_module
-
-resources:
- f5_modules:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: cluster_size }
- resource_def:
- type: vvm_f5_5nic.nested.heat.yaml
- properties:
- lb_system_name: { get_param: lb_server_group }
- server_name: { get_param: server_name }
- image_name: { get_param: image_name }
- flavor_name: { get_param: flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- security_group_name: { get_param: security_group_name }
- oam_mgmt_network_id: { get_param: oam_mgmt_network_id }
- oam_mgmt_network_ip: { get_param: oam_mgmt_network_ip }
- oam_network_id: { get_param: oam_network_id }
- oam_network_ip: { get_param: oam_network_ip }
- oam_network_vip_ip: { get_param: oam_network_vip_ip }
- dmz_network_id: { get_param: dmz_network_id }
- dmz_network_ip: { get_param: dmz_network_ip }
- dmz_network_vip_ip: { get_param: dmz_network_vip_ip }
- core_network_id: { get_param: core_network_id }
- core_network_ip: { get_param: core_network_ip }
- core_network_vip_ip: { get_param: core_network_vip_ip }
- ha_network_id: { get_param: ha_network_f5_id }
- ha_local_ip: { get_param: ha_local_ip }
- vnf_id: { get_param: vnf_id }
- vf_module_id: { get_param: vf_module_id }
- indx: "%index%"
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/MANIFEST.json
deleted file mode 100644
index 06df1e696d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 089284d177..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: 1
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 4944424af8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: number
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: OS::Heat::CloudConfig
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/env_parameters_match_defined_types/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/MANIFEST.json
deleted file mode 100644
index c27fba2205..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 4a66bf5bf6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-
-
-outputs:
- server_pcrf_psm_001_output:
- description: the pcrf_server
- value: { get_attr: [ server_pcrf_psm_001, nested_output ] }
-
-
- server_pcrf_psm_002_output:
- description: the pcrf_server
- value: { get_attr: }
-
- server_pcrf_psm_003_output:
- description: the pcrf_server
- value: { get_attr: []}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index c26a0dd3a8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/negative_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
-
-
-outputs:
- not_in_resource:
- description: the pcrf_swift_container_1 url
- value: { get_param: pcrf_psm_server_name } \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 4ab762d34b..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,204 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-outputs:
- server_pcrf_psm_001_output:
- description: the pcrf_server
- value: { get_attr: [ server_pcrf_psm_001, nested_output ] }
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 4b7aac8f44..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_attr_from_nested/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
-
-
-outputs:
- nested_output:
- description: the pcrf_swift_container_1 url
- value: { get_param: pcrf_psm_server_name } \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/MANIFEST.json
deleted file mode 100644
index c27fba2205..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 6eb260e380..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
-
-
- server_pcrf_psm_001:
- type: OS::Contrail::NetworkIpam
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_cps_net_mask: { get_param: }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
- property_pointing_to_not_existing_param: {get_param: not_existing_param_1}
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_param_points_to_existing_parameter/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/MANIFEST.json
deleted file mode 100644
index a1ec6bc0f7..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 9a8e58ffe2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/get_resource_value_valid/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- param_1:
- type: number
-
- param_2:
- type: number
-
-
-resources:
- server_pcrf_pps_006:
- type: OS::Contrail::NetworkIpam
- properties:
- pcrf_pps_server_name: { get_resource: [param_1, param_2] }
-
-
- server_pcrf_pps_007:
- type: OS::Contrail::NetworkIpam
- properties:
- pcrf_pps_server_name: { get_resource: {get_param: param_1} }
-
-
- server_pcrf_pps_008:
- type: OS::Contrail::NetworkIpam
- properties:
- pcrf_pps_server_name: { get_resource: }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/MANIFEST.json
deleted file mode 100644
index 5513de2ba2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index a5ee917b2c..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/invalid_heat_format/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- num_instances:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
-
- pcrf_pps_image_name:
- type: string
- pcrf_pps_flavor_name:
- type: string
- availability_zone_0:
- type: string
-resources:
- resource_with_resources_group_1:
- kuku: kuku
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: {get_param: pcrf_vnf_id}
- properties:
- pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
- pcrf_psm_image_name: { get_param: pcrf_pps_image_name }
-
-
-
-
- resource_with_resources_group_2:
- blabla: blabla
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: OS::Nova::Server
- properties:
- cloud_zone_id: { get_param: pcrf_pps_server_names }
- vf_name: { get_param: pcrf_pps_image_name }
-
-
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index b2b91ec36d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/network_policy_associated_with_attach_policy/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- used_server_pcrf_policy:
- type: OS::Contrail::NetworkPolicy
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- not_used_server_pcrf_policy:
- type: OS::Contrail::NetworkPolicy
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- server_pcrf_network:
- type: OS::Contrail::VirtualNetwork
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- attach_policy_resource:
- type: OS::Contrail::AttachPolicy
- properties:
- network: { get_resource: server_pcrf_network }
- policy: { get_attr: [used_server_pcrf_policy, fq_name] }
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/MANIFEST.json
deleted file mode 100644
index e789fd7b1d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-points-to-hot-nimbus-psm.yaml",
- "type": "HEAT"
- },
- {
- "file": "yaml-point-to-itself.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 49e03e0a16..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
-
- server_pcrf_psm_002:
- type:
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-points-to-hot-nimbus-psm.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-points-to-hot-nimbus-psm.yaml
deleted file mode 100644
index 981c08c011..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-points-to-hot-nimbus-psm.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- network:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: hot-nimbus-psm_v1.0.yaml
- properties:
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index bfc412d715..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- psm01_port_0:
- type: nested-points-to-hot-nimbus-psm.yaml
- properties:
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/yaml-point-to-itself.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/yaml-point-to-itself.yaml
deleted file mode 100644
index ec2a02a5d2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/negative_test/input/yaml-point-to-itself.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
-
-resources:
-
- resource_points_to_itself:
- type: yaml-point-to-itself.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_name, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/no_loops_nesting/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/MANIFEST.json
deleted file mode 100644
index dd26e5ac45..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 8ef73ded21..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- nova_server_resource_missing_both:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- nova_server_resource_only_image:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- image: { get_param: pcrf_psm_image_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- nova_server_resource_only_flavor:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- flavor: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
-
- nova_server_resource_both_without_get_param:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- flavor: { get_param: }
- image: { get_param: }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 25a4545311..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,236 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- nova_server_resource:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- nova_server_resource_only_image:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- image: { get_param: pcrf_psm_image_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- nova_server_resource_only_flavor:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- flavor: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/nova_properties_has_assigned_value/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/MANIFEST.json
deleted file mode 100644
index dd26e5ac45..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index f7678ed6b7..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- vnf_id:
- type: string
-
-resources:
- nova_server_2:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: oam1_int_port }
- fixed_ip: 10.0.0.0
- floating_ip: 10.0.0.1
- network: 100_1000_0011
- port_extra_properties: {admin_state_up: true , allowed_address_pairs: 10}
- subnet: 10.0.0.2
- - port: { get_resource: oam1_mgmt_port }
- metadata:
- vnf_id: { get_param: vnf_id }
-
- nova_server_3:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: oam1_int_port }
- fixed_ip: 10.0.0.0
- floating_ip: 10.0.0.1
- network: 100_1000_0011
- port_extra_properties: {admin_state_up: true , allowed_address_pairs: 10}
- subnet: 10.0.0.2
- metadata:
- vnf_id: { get_param: vnf_id }
-
- oam1_int_port:
- type: OS::Neutron::Port
- properties:
- network: {get_param: pcrf_psm_server_names}
- fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
- security_groups: [{get_param: pcrf_psm_image_name}]
- replacement_policy: AUTO
-
- oam1_mgmt_port:
- type: OS::Neutron::Port
- properties:
- network: {get_param: pcrf_psm_server_names}
- fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
- security_groups: [{get_param: pcrf_psm_image_name}]
- replacement_policy: AUTO \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c173fce968..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,233 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- nova_server_1:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: oam1_int_port }
- fixed_ip: 10.0.0.0
- floating_ip: 10.0.0.1
- network: 100_1000_0011
- port_extra_properties: {admin_state_up: true , allowed_address_pairs: 10}
- subnet: 10.0.0.2
- - port: { get_resource: oam1_mgmt_port }
- metadata:
- vnf_id: { get_param: vnf_id }
-
- oam1_int_port:
- type: OS::Neutron::Port
- properties:
- network: {get_param: pcrf_psm_server_names}
- fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
- security_groups: [{get_param: pcrf_psm_image_name}]
- replacement_policy: AUTO
-
- oam1_mgmt_port:
- type: OS::Neutron::Port
- properties:
- network: {get_param: pcrf_psm_server_names}
- fixed_ips: [{"ip_address": {get_param: [pcrf_psm_image_name, 0]}}]
- security_groups: [{get_param: pcrf_psm_image_name}]
- replacement_policy: AUTO
-
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/one_nova_points_to_one_port/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/negative_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/expected_output/expected_output.json
deleted file mode 100644
index ce04d8c601..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "name": "multiple_not_nested",
- "description": "multiple heat files in zip, no nesting",
- "version": "2013-05-23",
- "data": [{
- "file": "cmaui.yml",
- "type": "HEAT",
- "data": [{
- "file": "cmaui.env",
- "type": "HEAT_ENV"
- }]
- },
- {
- "file": "eca_oam.yaml",
- "type": "HEAT",
- "data": [{
- "file": "eca_oam.env",
- "type": "HEAT_ENV"
- }]
- },
- {
- "file": "eca_oam_nested.yaml",
- "type": "HEAT"
- },
- {
- "file": "MMSC_Capacity_Line.yml",
- "type": "HEAT",
- "data": [{
- "file": "MMSC_Capacity_Line_1.env",
- "type": "HEAT_ENV"
- }]
- },
- {
- "file": "SG_ECA_MGMT.yaml",
- "type": "HEAT",
- "data": [{
- "file": "sg_eca_mgmt.env",
- "type": "HEAT_ENV"
- }]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index fc5b6f74c3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index c86aa34713..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/parameter_default_value/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/MANIFEST.json
deleted file mode 100644
index dd26e5ac45..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f613758633..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,8 +0,0 @@
-parameters:
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 82edacf101..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- scheduler_hints: {group_1: { get_resource: pcrf_server_policies_1 }, group_2: { get_resource: pcrf_server_policies_2 }, group_3: { get_resource: pcrf_server_policies_3 }}
-
- pcrf_server_policies_1:
- type: OS::Nova::ServerGroup
- properties:
- config_drive: "True"
- policies: [affinity, anti-affinity]
-
- pcrf_server_policies_2:
- type: OS::Nova::ServerGroup
- properties:
- config_drive: "True"
- policies:
-
- pcrf_server_policies_3:
- type: OS::Nova::ServerGroup
- properties:
- config_drive: "True"
- policies: [affinity, ]
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index a7966d6d47..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_server_policies:
- type: OS::Nova::ServerGroup
- properties:
- config_drive: "True"
- policies: [affinity]
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 681117d275..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/policy_is_affinity_or_anti_affinity/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
-
- pcrf_server_policies:
- type: OS::Nova::ServerGroup
- properties:
- config_drive: "True"
- policies: [anti-affinity]
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index fc5b6f74c3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index c86aa34713..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/negative_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index fc5b6f74c3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index c86aa34713..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties-match-nested-parameters/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/MANIFEST.json
deleted file mode 100644
index 02118a7b23..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 5d93b2f4f7..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- parameter_not_existing_in_nested: {get_param: pcrf_vnf_id}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index 0ed9043fc2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/negative_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/properties_match_nested_parameters/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/MANIFEST.json
deleted file mode 100644
index d038fb2a7e..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/MANIFEST.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "pseudo_parameters.yml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/pseudo_parameters.yml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/pseudo_parameters.yml
deleted file mode 100644
index 8dd378ccbd..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/pseudo_parameters/input/pseudo_parameters.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: HOT template for vMME Cinder Volumes
-
-
-parameters:
-
- volume_type:
- type: string
- label: volume type
- description: volume type SolidFire
-
- volume_size:
- type: number
- label: volume size
- description: my volume size 320GB
-
- FSB_1_image:
- type: string
- label: MME_FSB1
- description: MME_FSB1_16ACP03_GA
-
- FSB_2_image:
- type: string
- label: MME_FSB2
- description: MME_FSB2_16ACP03_GA
-
-resources:
-
- FSB1_volume:
- type: OS::Cinder::Volume
- properties:
- name:
- list_join: ['_', [{get_param: 'OS::stack_name'}, 'FSB1_Vol_1']]
-
- FSB2_volume:
- type: OS::Cinder::Volume
- properties:
- name:
- list_join: ['_', [{get_param: 'OS::stack_id'}, 'FSB1_Vol_2']]
-
- FSB3_volume:
- type: OS::Cinder::Volume
- properties:
- name:
- list_join: ['_', [{get_param: 'OS::project_id'}, 'FSB1_Vol_3']]
-
-
-outputs:
- FSB1_volume_id:
- description: ID of Cinder Volume for FSB1
- value: {get_resource: FSB1_volume}
-
- FSB2_volume_id:
- description: ID of Cinder Volume for FSB2
- value: {get_resource: FSB2_volume}
-
- FSB3_volume_id:
- description: ID of Cinder Volume for FSB3
- value: {get_resource: FSB3_volume}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/MANIFEST.json
deleted file mode 100644
index a1ec6bc0f7..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index c4680ab619..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/MANIFEST.json
deleted file mode 100644
index ea7f326c76..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "artifact.sh",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/artifact.sh b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/artifact.sh
deleted file mode 100644
index fc5b6f74c3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/artifact.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/cloud-nimbus.sh b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/cloud-nimbus.sh
deleted file mode 100644
index fc5b6f74c3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/cloud-nimbus.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index a591692753..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- artifact_resource:
- type: OS::Nova::Server
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- artifact: { get_file: artifact.sh }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index fc5b6f74c3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index c86aa34713..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nimbus-ethernet b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nimbus-ethernet
deleted file mode 100644
index fc5b6f74c3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/referenced_artifacts_exist/positive_test/input/nimbus-ethernet
+++ /dev/null
@@ -1,99 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/MANIFEST.json
deleted file mode 100644
index 5513de2ba2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 14ee7b10d2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- num_instances:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_pps_server_names:
- type: string
-
- pcrf_pps_image_name:
- type: string
- pcrf_pps_flavor_name:
- type: string
- availability_zone_0:
- type: string
-resources:
- resource_with_resources_group_1:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: {get_param: pcrf_vnf_id}
- properties:
- pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
- pcrf_psm_image_name: { get_param: pcrf_pps_image_name }
-
-
-
-
- resource_with_resources_group_2:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: OS::Nova::Server
- properties:
- cloud_zone_id: { get_param: pcrf_pps_server_names }
- vf_name: { get_param: pcrf_pps_image_name }
-
-
-
- resource_with_resources_group_3:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type:
- properties:
- cloud_zone_id: { get_param: pcrf_pps_server_names }
- vf_name: { get_param: pcrf_pps_image_name }
-
-
- resource_with_resources_group_4:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: yamlFile.yaml
-
-
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/yamlFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/yamlFile.yaml
deleted file mode 100644
index 12a838bcf5..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_group_invalid_type/negative_test/input/yamlFile.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- num_instances:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_pps_server_names:
- type: string \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/MANIFEST.json
deleted file mode 100644
index 3a4d09caa9..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 1154c06f4d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-resources:
- server_pcrf_pps_007:
- type: OS::Contrail::NetworkIpam
- properties:
- pcrf_pps_server_name: { get_resource: not_existing_resource }
-
- server_pcrf_pps_008:
- type: OS::Contrail::NetworkIpam
- properties:
- pcrf_pps_server_name: { get_resource: }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 05bd6c9318..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resource_references_exist_in_heat/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/MANIFEST.json
deleted file mode 100644
index 0c8e740434..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index e3779ed99d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- num_instances:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
-
-
- resource_with_resources_group:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: nested-not-exist.yaml
- properties:
- pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index dc78b37ca2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- num_instances:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_pps_server_names:
- type: string
-
- pcrf_pps_image_name:
- type: string
- pcrf_pps_flavor_name:
- type: string
- availability_zone_0:
- type: string
-resources:
- resource_with_resources_group:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: nested-from-resources-group.yaml
- properties:
- pcrf_psm_server_name: { get_param: pcrf_pps_server_names }
- pcrf_psm_image_name: { get_param: pcrf_pps_image_name }
- property_not_in_nested: { get_param: availabilityzone_name }
- pcrf_cps_net_name: { get_param: availabilityzone_name }
- pcrf_cps_net_ip: { get_param: pcrf_vnf_id }
- pcrf_cps_net_mask: { get_param: pcrf_vnf_id }
- pcrf_security_group_name: { get_param: pcrf_pps_image_name }
- pcrf_vnf_id: { get_param: pcrf_pps_flavor_name }
-
- availabilityzone_name: { get_param: availability_zone_0 }
-
-
-
- resource_without_resources_group:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: OS::Nova::Server
- properties:
- cloud_zone_id: { get_param: pcrf_pps_server_names }
- vf_name: { get_param: pcrf_pps_image_name }
- vf_instance_num: { get_param: pcrf_pps_image_name }
- vf_component: { get_param: availabilityzone_name }
- vm_instance_num: { get_param: availabilityzone_name }
- vnf_id: { get_param: pcrf_vnf_id }
- vf_module_id: { get_param: pcrf_vnf_id }
- bootimage: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- key_name: { get_param: pcrf_cps_net_mask }
-
- availability_zone_0: { get_param: availability_zone_0 }
-
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-from-resources-group.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-from-resources-group.yaml
deleted file mode 100644
index 836ab5c1f8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-from-resources-group.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
-
- psm01_port_1:
- type: hot-nimbus-pps_v1.0.yaml
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index bdf957c59e..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/negative_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- num_instances:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_pps_server_names:
- type: string
-resources:
- resource_with_resources_group:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: nested-from-resources-group.yaml
- properties:
- pcrf_psm_server_name: { get_param: pcrf_pps_server_names } \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index a1ea053e07..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index b12de0def4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- nova_server:
- type: OS::Nova::Server
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
- scheduler_hints: { group_1: { get_resource: BE_Affinity_1 }, group_2: { get_resource: BE_Affinity_2 } }
-
- BE_Affinity_1:
- type: OS::Nova::ServerGroup
- properties:
- network: { get_param: pcrf_pps_server_names }
-
- BE_Affinity_2:
- type: OS::Nova::ServerGroup
- properties:
- network: { get_param: pcrf_pps_server_names } \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 3f91e94d74..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,288 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- num_instances:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- resource_with_resources_group:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: nested-from-resources-group.yaml
- properties:
- cloud_zone_id: { get_param: cloud_zone_id }
- vf_name: { get_param: vf_name }
- vf_instance_num: { get_param: vf_instance_num }
- vf_component: { get_param: vf_component }
- vm_instance_num: { get_param: vm_instance_num }
- vnf_id: { get_param: vnf_id }
- vf_module_id: { get_param: vf_module_id }
- bootimage: { get_param: bootimage }
- flavor: { get_param: flavor }
- key_name: { get_param: key_name }
-
- availability_zone_0: { get_param: availability_zone_0 }
-
- sec_groups: { get_param: sec_groups }
- data_volume_size: { get_param: data_volume_size }
- mgmt_net_id: { get_param: mgmt_net_id }
-
- sas_mgmt_ip_0: { get_param: sas_mgmt_ip_0 }
-
- indx: "%index%"
-
-
- resource_without_resources_group:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: OS::Nova::Server
- properties:
- cloud_zone_id: { get_param: cloud_zone_id }
- vf_name: { get_param: vf_name }
- vf_instance_num: { get_param: vf_instance_num }
- vf_component: { get_param: vf_component }
- vm_instance_num: { get_param: vm_instance_num }
- vnf_id: { get_param: vnf_id }
- vf_module_id: { get_param: vf_module_id }
- bootimage: { get_param: bootimage }
- flavor: { get_param: flavor }
- key_name: { get_param: key_name }
-
- availability_zone_0: { get_param: availability_zone_0 }
-
- sec_groups: { get_param: sec_groups }
- data_volume_size: { get_param: data_volume_size }
- mgmt_net_id: { get_param: mgmt_net_id }
-
- sas_mgmt_ip_0: { get_param: sas_mgmt_ip_0 }
-
- indx: "%index%"
-
- resource_with_not_existing_resources_group:
- type: OS::Heat::ResourceGroup
- properties:
- count: { get_param: num_instances }
- resource_def:
- type: nested-from-resources-group.yaml
- properties:
- cloud_zone_id: { get_param: cloud_zone_id }
- vf_name: { get_param: vf_name }
- vf_instance_num: { get_param: vf_instance_num }
- vf_component: { get_param: vf_component }
- vm_instance_num: { get_param: vm_instance_num }
- vnf_id: { get_param: vnf_id }
- vf_module_id: { get_param: vf_module_id }
- bootimage: { get_param: bootimage }
- flavor: { get_param: flavor }
- key_name: { get_param: key_name }
-
- availability_zone_0: { get_param: availability_zone_0 }
-
- sec_groups: { get_param: sec_groups }
- data_volume_size: { get_param: data_volume_size }
- mgmt_net_id: { get_param: mgmt_net_id }
-
- sas_mgmt_ip_0: { get_param: sas_mgmt_ip_0 }
-
- indx: "%index%"
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-from-resources-group.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-from-resources-group.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-from-resources-group.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/resources_group_with_nested/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/MANIFEST.json
deleted file mode 100644
index f487bae31f..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "baseFile.yaml",
- "type": "HEAT",
- "isBase": true
- },
- {
- "file": "notBaseFile.yaml",
- "type": "HEAT",
- "isBase": false
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/baseFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/baseFile.yaml
deleted file mode 100644
index 9446d6fde0..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/baseFile.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
-
-parameters:
- jsa_net_name:
- type: string
- description: network name of jsa log network
- security_group_name:
- type: string
- label: security group name
- description: the name of security group
-
-resources:
- jsa_security_group1:
- type: OS::Neutron::SecurityGroup
- properties:
- description: ems security group
- name: {get_param: security_group_name}
-
-
- jsa_security_group2:
- type: OS::Neutron::SecurityGroup
- properties:
- description: ems security group
- name: {get_param: security_group_name}
-
- jsa_security_group3:
- type: OS::Neutron::SecurityGroup
- properties:
- description: ems security group
- name: {get_param: security_group_name}
-
-outputs:
- shared_security_group_id1:
- value: {get_resource: jsa_security_group1}
-
- shared_security_group_id2:
- value: {get_resource: jsa_security_group2}
-
- shared_security_group_id3:
- value: {get_resource: jsa_security_group3} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/notBaseFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/notBaseFile.yaml
deleted file mode 100644
index 7ac05194ac..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_base_file_no_ports/input/notBaseFile.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: >
- Version 2.0 02-09-2016 (Authors: John Doe, user PROD)
-
-parameters:
- shared_security_group_id1:
- type: string
- description: network name of jsa log network
- shared_security_group_id2:
- type: string
- description: network name of jsa log network
- jsa_net_name:
- type: string
- description: network name of jsa log network
- security_group_name:
- type: string
- label: security group name
- description: the name of security group
-
-resources:
- test_nested:
- type: OS::Contrail::NetworkIpam
- properties:
- p1: { get_param: shared_security_group_id1}
- p2: { get_param: shared_security_group_id2}
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 51b9481bfa..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/security_group_called_by_port/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- used_security_group:
- type: OS::Neutron::SecurityGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- not_used_security_group:
- type: OS::Neutron::SecurityGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- server_pcrf_network:
- type: OS::Contrail::VirtualNetwork
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- attach_policy_resource:
- type: OS::Neutron::Port
- properties:
- security_groups: [{ get_resource: used_security_group }]
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 63eea76e2e..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_group_called_by_nova_server/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- image_name:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- used_server_group:
- type: OS::Nova::ServerGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- not_used_server_group:
- type: OS::Nova::ServerGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- nova_server:
- type: OS::Nova::Server
- properties:
- scheduler_hints: { group: { get_resource: used_server_group } }
- image: {get_param: image_name}
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 1955922940..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- nova_server_1:
- type: OS::Nova::Server
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- scheduler_hints: { group_1: { get_resource: BE_Affinity_1 }, group_2: { get_resource: BE_Affinity_2 } }
- networks:
- - port: {get_resource: BE_Affinity_2}
-
-
- nova_server_2:
- type: OS::Nova::Server
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- scheduler_hints: { group_1: , group_2: { get_resource: BE_Affinity_2 } }
-
- BE_Affinity_2:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_pps_server_names }
-
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/MANIFEST.json
deleted file mode 100644
index fe7d8bdf5a..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "mount_iso_script.sh",
- "type": "SHELL"
- },
- {
- "file": "cloud-nimbus.sh",
- "type": "SHELL"
- },
- {
- "file": "nimbus-ethernet",
- "type": "OTHER"
- },
- {
- "file": "nimbus-ethernet-gw",
- "type": "OTHER"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index a1ea053e07..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index b12de0def4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- nova_server:
- type: OS::Nova::Server
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
- scheduler_hints: { group_1: { get_resource: BE_Affinity_1 }, group_2: { get_resource: BE_Affinity_2 } }
-
- BE_Affinity_1:
- type: OS::Nova::ServerGroup
- properties:
- network: { get_param: pcrf_pps_server_names }
-
- BE_Affinity_2:
- type: OS::Nova::ServerGroup
- properties:
- network: { get_param: pcrf_pps_server_names } \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index c2d7b05ead..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index b7291d69d3..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index 6868728b73..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/server_groups_defined_correctly/positive_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/MANIFEST.json
deleted file mode 100644
index 1e719efb31..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 1114734097..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/shared_resources/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- used_security_group:
- type: OS::Neutron::SecurityGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- not_used_security_group:
- type: OS::Neutron::SecurityGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- shared_security_group:
- type: OS::Neutron::SecurityGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- shared_server_group:
- type: OS::Nova::ServerGroup
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- server_pcrf_network:
- type: OS::Contrail::VirtualNetwork
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
-
- attach_policy_resource:
- type: OS::Neutron::Port
- properties:
- security_groups: [{ get_resource: used_security_group }]
-
-
-outputs:
- output_shrared_resource_1:
- description: uuid of the security group
- value: {get_resource: shared_security_group }
-
- output_shrared_resource_2:
- description: uuid of the security group
- value: {get_resource: shared_server_group }
-
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/MANIFEST.json
deleted file mode 100644
index 06df1e696d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/MANIFEST.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-pps_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "nested-pps_v1.0.yaml",
- "type": "HEAT"
- },
- {
- "file": "nested-psm_v1.0.yaml",
- "type": "HEAT"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.env
deleted file mode 100644
index 340be2b815..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.env
+++ /dev/null
@@ -1,11 +0,0 @@
-parameters:
- pcrf_pps_server_names: ZRDM1PCRF01PPS001,ZRDM1PCRF01PPS002,ZRDM1PCRF01PPS003,ZRDM1PCRF01PPS004,ZRDM1PCRF01PPS005,ZRDM1PCRF01PPS006
- pcrf_pps_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_pps_flavor_name: lc.3xlarge
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.7,172.26.16.8,172.26.16.9,172.26.16.10,172.26.16.11,172.26.16.12
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.yaml
deleted file mode 100644
index 717b915c68..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-pps_v1.0.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_server_names:
- type: comma_delimited_list
- label: PCRF PS server names
- description: PCRF PS server names
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_pps_001:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 0] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_002:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 1] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_003:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 2] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_004:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 3] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_005:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 4] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_pps_006:
- type: nested-pps_v1.0.yaml
- properties:
- pcrf_pps_server_name: { get_param: [pcrf_pps_server_names, 5] }
- pcrf_pps_image_name: { get_param: pcrf_pps_image_name }
- pcrf_pps_flavor_name: { get_param: pcrf_pps_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index de8d6b7658..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,207 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
- pcrf_vnf_id:
- type: number
- label: PCRF id number
- description: PCRF id number
-
-resources:
- server_pcrf_psm_001:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 0] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 0] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_002:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 1] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 1] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_003:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 2] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 2] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_004:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 3] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 3] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_005:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 4] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 4] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_006:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 5] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 5] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_007:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 6] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 6] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_008:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 7] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 7] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_009:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 8] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 8] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_010:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 9] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 9] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_011:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 10] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 10] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
- server_pcrf_psm_012:
- type: nested-psm_v1.0.yaml
- properties:
- pcrf_psm_server_name: { get_param: [pcrf_psm_server_names, 11] }
- pcrf_psm_image_name: { get_param: pcrf_psm_image_name }
- pcrf_psm_flavor_name: { get_param: pcrf_psm_flavor_name }
- availabilityzone_name: { get_param: availabilityzone_name }
- pcrf_security_group_name: { get_param: pcrf_security_group_name }
- pcrf_cps_net_name: { get_param: pcrf_cps_net_name }
- pcrf_cps_net_ip: { get_param: [pcrf_cps_net_ips, 11] }
- pcrf_cps_net_mask: { get_param: pcrf_cps_net_mask }
- pcrf_vnf_id: {get_param: pcrf_vnf_id}
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-pps_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-pps_v1.0.yaml
deleted file mode 100644
index 153820b2c2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-pps_v1.0.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Policy Server stack
-
-parameters:
- pcrf_pps_server_name:
- type: string
- label: PCRF PS server name
- description: PCRF PS server name
- pcrf_pps_image_name:
- type: string
- label: PCRF PS image name
- description: PCRF PS image name
- pcrf_pps_flavor_name:
- type: string
- label: PCRF PS flavor name
- description: flavor name of PCRF PS instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_pps_server_name }
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
-
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_pps:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_pps_server_name }
- image: { get_param: pcrf_pps_image_name }
- flavor: { get_param: pcrf_pps_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: pcrf_pps_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
-
- pcrf_pps_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }]
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-psm_v1.0.yaml
deleted file mode 100644
index f982cc9195..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/negative_test/input/nested-psm_v1.0.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_server_name:
- type: string
- label: PCRF SM server name
- description: PCRF SM server name
- pcrf_psm_image_name:
- type: string
- label: image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ip:
- type: string
- label: CPS network ip
- description: CPS network ip
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- network:
- type: OS::Heat::CloudConfig
- properties:
- cloud_config:
- write_files:
- - path: /etc/sysconfig/network-scripts/ifcfg-eth0
- permissions: "0644"
- content:
- str_replace:
- template: { get_file: nimbus-ethernet }
- params:
- $dev: eth0
- $ip: { get_param: pcrf_cps_net_ip }
- $netmask: { get_param: pcrf_cps_net_mask }
- runcmd:
- - ifdown eth0 && ifup eth0
- script_init:
- type: OS::Heat::SoftwareConfig
- properties:
- group: ungrouped
- config:
- str_replace:
- template: { get_file: cloud-nimbus.sh }
- params:
- $vm_name: { get_param: pcrf_psm_server_name }
- pcrf_server_init:
- type: OS::Heat::MultipartMime
- properties:
- parts:
- - config: { get_resource: network}
- - config: { get_resource: script_init}
-
- pcrf_server_psm:
- type: OS::Nova::Server
- properties:
- config_drive: "True"
- name: { get_param: pcrf_psm_server_name }
- image: { get_param: pcrf_psm_image_name }
- flavor: { get_param: pcrf_psm_flavor_name }
- availability_zone: { get_param: availabilityzone_name }
- networks:
- - port: { get_resource: psm01_port_0}
- user_data_format: RAW
- user_data:
- get_resource: pcrf_server_init
- metadata:
- vnf_id: {get_param: pcrf_vnf_id}
- #scheduler_hints: {group: { get_resource: servergroup_nimbus }}
-
- psm01_port_0:
- type: OS::Neutron::Port
- properties:
- network: { get_param: pcrf_cps_net_name }
- fixed_ips:
- - ip_address: { get_param: pcrf_cps_net_ip }
- security_groups: [{ get_param: pcrf_security_group_name }] \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/expected_output/expected_output.json
deleted file mode 100644
index 9e26dfeeb6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/expected_output/expected_output.json
+++ /dev/null
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/MANIFEST.json
deleted file mode 100644
index dd26e5ac45..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/MANIFEST.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "hot-mog",
- "description": "HOT template to create hot mog server",
- "version": "2013-05-23",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-psm_v1.0.env",
- "type": "HEAT_ENV"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.env
deleted file mode 100644
index f24e4763c6..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.env
+++ /dev/null
@@ -1,10 +0,0 @@
-parameters:
- pcrf_psm_server_names: ZRDM1PCRF01PSM001,ZRDM1PCRF01PSM002,ZRDM1PCRF01PSM003,ZRDM1PCRF01PSM004,ZRDM1PCRF01PSM005,ZRDM1PCRF01PSM006,ZRDM1PCRF01PSM007,ZRDM1PCRF01PSM008,ZRDM1PCRF01PSM009,ZRDM1PCRF01PSM010,ZRDM1PCRF01PSM011,ZRDM1PCRF01PSM012
- pcrf_psm_image_name: PCRF_8.995-ATTM1.0.3.qcow2
- pcrf_psm_flavor_name: lc.4xlarge4
- availabilityzone_name: nova
- pcrf_cps_net_name: Mobisupport-25193-I-INT1_int_pcrf_net_0
- pcrf_cps_net_ips: 172.26.16.63,172.26.16.64,172.26.16.65,172.26.16.66,172.26.16.67,172.26.16.68,172.26.16.69,172.26.16.70,172.26.16.71,172.26.16.72,172.26.16.73,172.26.16.74
- pcrf_cps_net_mask: 255.255.255.0
- pcrf_security_group_name: nimbus_security_group
- pcrf_vnf_id: 730797234b4a40aa99335157b02871cd
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.yaml
deleted file mode 100644
index 5e940bdd49..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/heat_validator/two_resources_does_not_hold_same_id/positive_test/input/hot-nimbus-psm_v1.0.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat template that creates PCRF Session Manager stack
-
-parameters:
- pcrf_psm_server_names:
- type: comma_delimited_list
- label: PCRF SM server names
- description: name of the PCRF SM instance
- pcrf_psm_image_name:
- type: string
- label: PCRF SM image name
- description: PCRF SM image name
- pcrf_psm_flavor_name:
- type: string
- label: PCRF SM flavor name
- description: flavor name of PCRF SM instance
- availabilityzone_name:
- type: string
- label: availabilityzone name
- description: availabilityzone name
- pcrf_cps_net_name:
- type: string
- label: CPS network name
- description: CPS network name
- pcrf_cps_net_ips:
- type: comma_delimited_list
- label: CPS network ips
- description: CPS network ips
- pcrf_cps_net_mask:
- type: string
- label: CPS network mask
- description: CPS network mask
- pcrf_security_group_name:
- type: string
- label: security group name
- description: the name of security group
- pcrf_vnf_id:
- type: string
- label: PCRF VNF Id
- description: PCRF VNF Id
-
-resources:
- server_pcrf_psm_001:
- type: OS::Contrail::NetworkIpam
-
- server_pcrf_psm_002:
- type: OS::Contrail::NetworkIpam
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/MANIFEST.json
deleted file mode 100644
index 5524f47fa8..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/MANIFEST.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "first.yaml",
- "type": "HEAT",
- "isBase": true,
- "data": [
- {
- "file": "first.env",
- "type": "HEAT_ENV"
- }
- ]
- },
- {
- "file": "second.env",
- "type": "HEAT_ENV"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.yaml
deleted file mode 100644
index 368834e847..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/first.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: heat expose volume resource
-
-resources:
- SecurityGroup_expose:
- type: OS::Neutron::Net
-
-outputs:
- not_expose_resource_network_output:
- description: the pcrf_server
- value: { get_param: ServerGroup_expose }
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/second.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/second.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/envInRoot/second.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/MANIFEST.json
deleted file mode 100644
index de35dfc0db..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/MANIFEST.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "single.yaml.illegalSuffix",
- "type": "HEAT",
- "data": [
- {
- "file": "single.env.illegalSuffix",
- "type": "HEAT_ENV"
- },
- {
- "file": "singleVol.yaml.illegalSuffix",
- "type": "HEAT_VOL"
- }
- ]
- },{
- "file": "illegalTypeFile.yaml",
- "type": "ILLEGAL_TYPE"
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/illegalTypeFile.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/illegalTypeFile.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/illegalTypeFile.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.env.illegalSuffix b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.env.illegalSuffix
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.env.illegalSuffix
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.yaml.illegalSuffix b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.yaml.illegalSuffix
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/single.yaml.illegalSuffix
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/singleVol.yaml.illegalSuffix b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/singleVol.yaml.illegalSuffix
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidFileTypeInManifest/singleVol.yaml.illegalSuffix
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/MANIFEST.json
deleted file mode 100644
index 7b3dd77ed7..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/MANIFEST.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "inValidTest",
- "description": "inValid Test",
- "version": [{"v": "1.0"}],
- "data": [
- {
- "file": "single.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "single.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "singleVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/single.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/singleVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/singleVol.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/invalidManifest/singleVol.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/MANIFEST.json
deleted file mode 100644
index fd2b2c3f6d..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/MANIFEST.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "invalidField":"value",
- "data": [
- {
- "file": "single.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "single.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "singleVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/extraFile.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/extraFile.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/extraFile.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/single.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/singleVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/singleVol.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifest/singleVol.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/MANIFEST.json
deleted file mode 100644
index 60a8efe769..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/MANIFEST.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "single.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "single.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "singleVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/extraFile.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/extraFile.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/extraFile.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInManifestAndInZip/single.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/MANIFEST.json
deleted file mode 100644
index 60a8efe769..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/MANIFEST.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "single.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "single.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "singleVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/missingFileInZip/single.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/MANIFEST.json
deleted file mode 100644
index 60a8efe769..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/MANIFEST.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "validTest",
- "description": "Valid Test",
- "version": "1610",
- "data": [
- {
- "file": "single.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "single.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "singleVol.yaml",
- "type": "HEAT_VOL"
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.env b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.env
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.env
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/single.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/singleVol.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/singleVol.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/manifestValidator/validFiles/singleVol.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml
deleted file mode 100644
index 418cc59c71..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/duplicateKey.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- Key_1_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
- Key_2_not_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
- Key_2_not_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
- Key_3_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/emptyYaml.yaml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidTabYamlStructure.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidTabYamlStructure.yaml
deleted file mode 100644
index 9cc18cef35..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidTabYamlStructure.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- Key_1_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
- Key_2_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
- Key_3_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml
deleted file mode 100644
index 65205e01f9..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalidYamlStructure.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- Key_1_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- - shared: true
- type: type_notReleventForTest
- Key_2_not_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
- Key_2_not_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
- Key_3_unique:
- properties:
- admin_state_up: true
- name: name_notReleventForTest
- shared: true
- type: type_notReleventForTest
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/MANIFEST.json
deleted file mode 100644
index a4065d0b68..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/MANIFEST.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "data": [
- {
- "file": "validHeat.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-oam_v1.0.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "hot-nimbus-oam-volumes_v1.0",
- "type": "HEAT_VOL",
- "data": [{
- "file": "hot-nimbus-oam-volumes_v1.0.env",
- "type": "HEAT_ENV"
- }]
- }
- ]
- },
- {
- "file": "mainValid.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-oam-networks_v1.0",
- "type": "HEAT_NET"
- }
- ]
- },
- {
- "file": "missingHeatFromZip.yaml.yaml",
- "type": "HEAT"
- }
- ],
- "description": "RXAEmleoRDWLeWVvmXUJxDKCItgjkMEXuKJcUWyVUZrCUiMzZSyHPzhqLcJSIUNBzohsIGXLBIwstuVDEuFtxuLIwWgCCdjprtvzruHIUKdVnCyifJQUJjqSCoKKKyVaWFTFKzHNhTZNlZTYaMKGEpIMXOpIxSyTZZCgVsGkItQelBbFVrmCltTgkuppYMrEfvwqNBLVRSGCucNwliWFZUuXloXBiZaqtodZjyFpqBNqhlpcrARmMpvLiz",
- "name": "FCTRQGcMevNngRDvECQYfiEXCYbGeAWRHdaGggLUgyOnssHAiU",
- "version": "2013-05-23"
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/heat_missing_from_manifast.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/heat_missing_from_manifast.yaml
deleted file mode 100644
index d5608abfb4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/heat_missing_from_manifast.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_4:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/mainValid.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/mainValid.yaml
deleted file mode 100644
index 318c8f1283..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/mainValid.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: missingNested.yaml
- network_4:
- properties:
- admin_state_up: true
- name: { get_file: missing-artifact }
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/validHeat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/validHeat.yaml
deleted file mode 100644
index d5608abfb4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_duplicate_key/input/validHeat.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_4:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/expected_output/expected_output.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/expected_output/expected_output.json
deleted file mode 100644
index dedbeaf5db..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/expected_output/expected_output.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "invalid_duplicateKey.yaml": {
- "errorMessageList": [
- {
- "level": "ERROR",
- "message": "Can\u0027t construct a java object for tag:yaml.org,2002:java.util.Map; exception\u003dwhile parsing MappingNode\n in \u0027string\u0027, line 6, column 3:\n network_0:\n ^\nduplicate key: network_0\n in \u0027string\u0027, line 26, column 1:\n \n ^\n\n in \u0027string\u0027, line 2, column 1:\n description: Generated template\n ^\n"
- }
- ]
- },
- "invalid_empty.yml": {
- "errorMessageList": [
- {
- "level": "ERROR",
- "message": "File:invalid_empty.yml is empty."
- }
- ]
- },
- "MANIFEST.json": {
- "errorMessageList": []
- },
- "invalid_yamlInXMLFormat.yaml": {
- "errorMessageList": [
- {
- "level": "ERROR",
- "message": "Can\u0027t construct a java object for tag:yaml.org,2002:java.util.Map; exception\u003dNo single argument constructor found for interface java.util.Map\n in \u0027string\u0027, line 1, column 1:\n \u003cstart\u003e\n ^\n"
- }
- ]
- },
- "expected_output.json": {
- "errorMessageList": []
- },
- "invalid_additionalSpaceBeforeProperty.yaml": {
- "errorMessageList": [
- {
- "level": "ERROR",
- "message": "while parsing a block mapping\n in \u0027string\u0027, line 7, column 5:\n properties:\n ^\nexpected \u003cblock end\u003e, but found BlockMappingStart\n in \u0027string\u0027, line 9, column 7:\n name: NET_167\n ^\n"
- }
- ]
- },
- "validHeat.yaml": {
- "errorMessageList": []
- },
- "heat_missing_from_manifast.yaml": {
- "errorMessageList": []
- }
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/MANIFEST.json
deleted file mode 100644
index a4065d0b68..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/MANIFEST.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "data": [
- {
- "file": "validHeat.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-oam_v1.0.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "hot-nimbus-oam-volumes_v1.0",
- "type": "HEAT_VOL",
- "data": [{
- "file": "hot-nimbus-oam-volumes_v1.0.env",
- "type": "HEAT_ENV"
- }]
- }
- ]
- },
- {
- "file": "mainValid.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-oam-networks_v1.0",
- "type": "HEAT_NET"
- }
- ]
- },
- {
- "file": "missingHeatFromZip.yaml.yaml",
- "type": "HEAT"
- }
- ],
- "description": "RXAEmleoRDWLeWVvmXUJxDKCItgjkMEXuKJcUWyVUZrCUiMzZSyHPzhqLcJSIUNBzohsIGXLBIwstuVDEuFtxuLIwWgCCdjprtvzruHIUKdVnCyifJQUJjqSCoKKKyVaWFTFKzHNhTZNlZTYaMKGEpIMXOpIxSyTZZCgVsGkItQelBbFVrmCltTgkuppYMrEfvwqNBLVRSGCucNwliWFZUuXloXBiZaqtodZjyFpqBNqhlpcrARmMpvLiz",
- "name": "FCTRQGcMevNngRDvECQYfiEXCYbGeAWRHdaGggLUgyOnssHAiU",
- "version": "2013-05-23"
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/heat_missing_from_manifast.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/heat_missing_from_manifast.yaml
deleted file mode 100644
index d5608abfb4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/heat_missing_from_manifast.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_4:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml
deleted file mode 100644
index 042f301507..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalidYamlTab.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_4:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_additionalSpaceBeforeProperty.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_additionalSpaceBeforeProperty.yaml
deleted file mode 100644
index b47d7d32f4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_additionalSpaceBeforeProperty.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: missingNested.yaml
- network_4:
- properties:
- admin_state_up: true
- name: { get_file: missing-artifact }
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_duplicateKey.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_duplicateKey.yaml
deleted file mode 100644
index 2dc0c63941..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_duplicateKey.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
-
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_empty.yml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_empty.yml
deleted file mode 100644
index e69de29bb2..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_empty.yml
+++ /dev/null
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_yamlInXMLFormat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_yamlInXMLFormat.yaml
deleted file mode 100644
index 54626a9d62..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/invalid_yamlInXMLFormat.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-<start>
- <additional>dfdf
- </additional>
-</start> \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/validHeat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/validHeat.yaml
deleted file mode 100644
index d5608abfb4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/invalid_valid_yaml_structure/input/validHeat.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_4:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/MANIFEST.json
deleted file mode 100644
index a4065d0b68..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/MANIFEST.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "data": [
- {
- "file": "validHeat.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-oam_v1.0.env",
- "type": "HEAT_ENV"
- },
- {
- "file": "hot-nimbus-oam-volumes_v1.0",
- "type": "HEAT_VOL",
- "data": [{
- "file": "hot-nimbus-oam-volumes_v1.0.env",
- "type": "HEAT_ENV"
- }]
- }
- ]
- },
- {
- "file": "mainValid.yaml",
- "type": "HEAT",
- "data": [
- {
- "file": "hot-nimbus-oam-networks_v1.0",
- "type": "HEAT_NET"
- }
- ]
- },
- {
- "file": "missingHeatFromZip.yaml.yaml",
- "type": "HEAT"
- }
- ],
- "description": "RXAEmleoRDWLeWVvmXUJxDKCItgjkMEXuKJcUWyVUZrCUiMzZSyHPzhqLcJSIUNBzohsIGXLBIwstuVDEuFtxuLIwWgCCdjprtvzruHIUKdVnCyifJQUJjqSCoKKKyVaWFTFKzHNhTZNlZTYaMKGEpIMXOpIxSyTZZCgVsGkItQelBbFVrmCltTgkuppYMrEfvwqNBLVRSGCucNwliWFZUuXloXBiZaqtodZjyFpqBNqhlpcrARmMpvLiz",
- "name": "FCTRQGcMevNngRDvECQYfiEXCYbGeAWRHdaGggLUgyOnssHAiU",
- "version": "2013-05-23"
-} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/heat_missing_from_manifast.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/heat_missing_from_manifast.yaml
deleted file mode 100644
index d5608abfb4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/heat_missing_from_manifast.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_4:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/mainValid.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/mainValid.yaml
deleted file mode 100644
index 318c8f1283..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/mainValid.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: missingNested.yaml
- network_4:
- properties:
- admin_state_up: true
- name: { get_file: missing-artifact }
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml
deleted file mode 100644
index d5608abfb4..0000000000
--- a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/resources/openecomp/org/validation/validators/yaml_validator/valid_yaml/input/validHeat.yaml
+++ /dev/null
@@ -1,250 +0,0 @@
-### Heat Template ###
-description: Generated template
-heat_template_version: 2013-05-23
-parameters: {}
-resources:
- network_0:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- network_1:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_2:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_3:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_4:
- properties:
- admin_state_up: true
- name: NET_169
- shared: true
- type: OS::Neutron::Net
- network_5:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_6:
- properties:
- admin_state_up: true
- name: NET_168
- shared: true
- type: OS::Neutron::Net
- network_7:
- properties:
- admin_state_up: true
- name: NET_170
- shared: true
- type: OS::Neutron::Net
- network_8:
- properties:
- admin_state_up: true
- name: NET_166
- shared: true
- type: OS::Neutron::Net
- network_9:
- properties:
- admin_state_up: true
- name: NET_167
- shared: true
- type: OS::Neutron::Net
- security_group_0:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- security_group_1:
- properties:
- description: Default security group
- name: _default
- rules:
- - direction: egress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- - direction: ingress
- ethertype: IPv4
- remote_ip_prefix: 0.0.0.0/0
- type: OS::Neutron::SecurityGroup
- subnet_0:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_9
- type: OS::Neutron::Subnet
- subnet_1:
- properties:
- allocation_pools:
- - end: 10.147.32.254
- start: 10.147.32.130
- cidr: 10.147.32.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_167
- network_id:
- get_resource: network_0
- type: OS::Neutron::Subnet
- subnet_2:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_8
- type: OS::Neutron::Subnet
- subnet_3:
- properties:
- allocation_pools:
- - end: 10.147.32.126
- start: 10.147.32.2
- cidr: 10.147.32.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_166
- network_id:
- get_resource: network_2
- type: OS::Neutron::Subnet
- subnet_4:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_5
- type: OS::Neutron::Subnet
- subnet_5:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_6
- type: OS::Neutron::Subnet
- subnet_6:
- properties:
- allocation_pools:
- - end: 10.147.33.126
- start: 10.147.33.2
- cidr: 10.147.33.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_168
- network_id:
- get_resource: network_3
- type: OS::Neutron::Subnet
- subnet_7:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_1
- type: OS::Neutron::Subnet
- subnet_8:
- properties:
- allocation_pools:
- - end: 10.147.33.254
- start: 10.147.33.130
- cidr: 10.147.33.128/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_169
- network_id:
- get_resource: network_4
- type: OS::Neutron::Subnet
- subnet_9:
- properties:
- allocation_pools:
- - end: 10.147.34.126
- start: 10.147.34.2
- cidr: 10.147.34.0/25
- dns_nameservers:
- - 10.147.4.18
- - 10.247.5.11
- enable_dhcp: true
- host_routes: []
- ip_version: 4
- name: NET_170
- network_id:
- get_resource: network_7
- type: OS::Neutron::Subnet
-