[SDC-29] Amdocs OnBoard 1707 initial commit.

Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370
Signed-off-by: AviZi <avi.ziv@amdocs.com>

16 files changed, 0 insertions, 709 deletions

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 }