From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- .../src/test/resources/CI/csars/FCGI_with_inputs.csar | Bin 35433 -> 0 bytes .../test/resources/CI/csars/ImportArtifactsToVFC.csar | Bin 57082 -> 0 bytes .../CI/csars/ImportArtifactsToVFC_empty.csar | Bin 30674 -> 0 bytes .../test/resources/CI/csars/LDSA1_with_inputs.csar | Bin 28284 -> 0 bytes .../test/resources/CI/csars/ToscaTemplateCsar.csar | Bin 6175 -> 0 bytes .../resources/CI/csars/VF_RI2_G4_withArtifacts.csar | Bin 36439 -> 0 bytes .../resources/CI/csars/VF_RI2_G4_withArtifacts_a.csar | Bin 36439 -> 0 bytes .../resources/CI/csars/VF_RI2_G4_withArtifacts_b.csar | Bin 36443 -> 0 bytes .../csars/VF_RI2_G4_withArtifacts_group_naming.csar | Bin 35872 -> 0 bytes .../csars/VF_RI2_G4_withArtifacts_group_naming_a.csar | Bin 35872 -> 0 bytes ..._RI2_G4_withArtifacts_group_naming_add_update.csar | Bin 35852 -> 0 bytes ...2_G4_withArtifacts_group_naming_delete_update.csar | Bin 35851 -> 0 bytes .../CI/csars/VF_RI2_G4_withArtifacts_update.csar | Bin 36436 -> 0 bytes .../test/resources/CI/csars/jsonPropertyTypeTest.csar | Bin 24750 -> 0 bytes asdc-tests/src/test/resources/CI/csars/mycompute.yml | 18 ------------------ asdc-tests/src/test/resources/CI/csars/mycompute2.yml | 18 ------------------ .../src/test/resources/CI/csars/mycompute_failed.yml | 18 ------------------ asdc-tests/src/test/resources/CI/csars/orig2G.csar | Bin 38917 -> 0 bytes .../src/test/resources/CI/csars/orig2GV001.csar | Bin 39002 -> 0 bytes .../src/test/resources/CI/csars/orig2GV001_a.csar | Bin 39002 -> 0 bytes .../csars/orig2GV006-remove-all-nested-artifacts.csar | Bin 39000 -> 0 bytes .../orig2GV008-change-nested-oam-fileContent.csar | Bin 39013 -> 0 bytes asdc-tests/src/test/resources/CI/csars/orig2G_a.csar | Bin 38917 -> 0 bytes .../src/test/resources/CI/csars/orig2G_updated.csar | Bin 38791 -> 0 bytes asdc-tests/src/test/resources/CI/csars/valid_vf.csar | Bin 1316 -> 0 bytes .../src/test/resources/CI/csars/valid_vf_a.csar | Bin 1316 -> 0 bytes .../src/test/resources/CI/csars/valid_vf_b.csar | Bin 1244 -> 0 bytes .../src/test/resources/CI/csars/valid_vf_c.csar | Bin 1316 -> 0 bytes .../src/test/resources/CI/csars/valid_vf_d.csar | Bin 1406 -> 0 bytes .../src/test/resources/CI/csars/valid_vf_f.csar | Bin 1443 -> 0 bytes .../resources/CI/csars/vf_relate_by_cap_name.csar | Bin 25918 -> 0 bytes .../vf_with_cap_prop_override_cap_type_prop.csar | Bin 1411 -> 0 bytes .../vf_with_cap_prop_override_cap_type_prop1.csar | Bin 1548 -> 0 bytes ..._with_cap_prop_override_cap_type_prop1_failed.csar | Bin 1546 -> 0 bytes ...f_with_cap_prop_override_cap_type_prop_failed.csar | Bin 1412 -> 0 bytes .../src/test/resources/CI/csars/vfc_artifacts.csar | Bin 48225 -> 0 bytes .../resources/CI/csars/vfc_artifacts_delete_all.csar | Bin 26179 -> 0 bytes .../test/resources/CI/csars/vfc_artifacts_update.csar | Bin 48245 -> 0 bytes .../resources/CI/csars/vmmc_relate_by_cap_name.csar | Bin 35471 -> 0 bytes 39 files changed, 54 deletions(-) delete mode 100644 asdc-tests/src/test/resources/CI/csars/FCGI_with_inputs.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC_empty.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/LDSA1_with_inputs.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/ToscaTemplateCsar.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_a.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_b.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_a.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_add_update.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_delete_update.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_update.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/jsonPropertyTypeTest.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/mycompute.yml delete mode 100644 asdc-tests/src/test/resources/CI/csars/mycompute2.yml delete mode 100644 asdc-tests/src/test/resources/CI/csars/mycompute_failed.yml delete mode 100644 asdc-tests/src/test/resources/CI/csars/orig2G.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/orig2GV001.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/orig2GV001_a.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/orig2GV006-remove-all-nested-artifacts.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/orig2GV008-change-nested-oam-fileContent.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/orig2G_a.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/orig2G_updated.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/valid_vf.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/valid_vf_a.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/valid_vf_b.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/valid_vf_c.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/valid_vf_d.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/valid_vf_f.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vf_relate_by_cap_name.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1_failed.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop_failed.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vfc_artifacts.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vfc_artifacts_delete_all.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vfc_artifacts_update.csar delete mode 100644 asdc-tests/src/test/resources/CI/csars/vmmc_relate_by_cap_name.csar (limited to 'asdc-tests/src/test/resources/CI/csars') diff --git a/asdc-tests/src/test/resources/CI/csars/FCGI_with_inputs.csar b/asdc-tests/src/test/resources/CI/csars/FCGI_with_inputs.csar deleted file mode 100644 index 9c1629eae7..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/FCGI_with_inputs.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC.csar b/asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC.csar deleted file mode 100644 index 7fc5306bcc..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC_empty.csar b/asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC_empty.csar deleted file mode 100644 index 7a77e2011d..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/ImportArtifactsToVFC_empty.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/LDSA1_with_inputs.csar b/asdc-tests/src/test/resources/CI/csars/LDSA1_with_inputs.csar deleted file mode 100644 index 821b62d48a..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/LDSA1_with_inputs.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/ToscaTemplateCsar.csar b/asdc-tests/src/test/resources/CI/csars/ToscaTemplateCsar.csar deleted file mode 100644 index e12f45e1b1..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/ToscaTemplateCsar.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts.csar deleted file mode 100644 index 98e20258b2..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_a.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_a.csar deleted file mode 100644 index 98e20258b2..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_a.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_b.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_b.csar deleted file mode 100644 index 4668bbefb8..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_b.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming.csar deleted file mode 100644 index 04464af741..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_a.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_a.csar deleted file mode 100644 index 4903bff3b6..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_a.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_add_update.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_add_update.csar deleted file mode 100644 index 8398e710b4..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_add_update.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_delete_update.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_delete_update.csar deleted file mode 100644 index 61a494c092..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_group_naming_delete_update.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_update.csar b/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_update.csar deleted file mode 100644 index 035497a52e..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/VF_RI2_G4_withArtifacts_update.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/jsonPropertyTypeTest.csar b/asdc-tests/src/test/resources/CI/csars/jsonPropertyTypeTest.csar deleted file mode 100644 index 07118fc014..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/jsonPropertyTypeTest.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/mycompute.yml b/asdc-tests/src/test/resources/CI/csars/mycompute.yml deleted file mode 100644 index c8a0c03384..0000000000 --- a/asdc-tests/src/test/resources/CI/csars/mycompute.yml +++ /dev/null @@ -1,18 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.mycompute: - derived_from: tosca.nodes.Compute - capabilities: - scalable: - type: tosca.capabilities.Scalable - properties: - propertyForTest: - type: string - description: test - required: true - default: success - # min_instances property should override property from tosca.capabilities.Scalable - min_instances: - type: integer - default: 3 - diff --git a/asdc-tests/src/test/resources/CI/csars/mycompute2.yml b/asdc-tests/src/test/resources/CI/csars/mycompute2.yml deleted file mode 100644 index 9d479a1a55..0000000000 --- a/asdc-tests/src/test/resources/CI/csars/mycompute2.yml +++ /dev/null @@ -1,18 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.mycompute2: - derived_from: tosca.nodes.Compute - capabilities: - scalable: - type: tosca.capabilities.Scalable - properties: - propertyForTest: - type: string - description: test - required: true - default: success - # min_instances property should override property from tosca.capabilities.Scalable - min_instances: - type: integer - default: 3 - diff --git a/asdc-tests/src/test/resources/CI/csars/mycompute_failed.yml b/asdc-tests/src/test/resources/CI/csars/mycompute_failed.yml deleted file mode 100644 index a4d8e448f1..0000000000 --- a/asdc-tests/src/test/resources/CI/csars/mycompute_failed.yml +++ /dev/null @@ -1,18 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - org.openecomp.resource.vfc.mycompute: - derived_from: tosca.nodes.Compute - capabilities: - scalable: - type: tosca.capabilities.Scalable - properties: - propertyForTest: - type: string - description: test - required: true - default: success - # min_instances property should override property from tosca.capabilities.Scalable - min_instances: - type: string - default: 3 - diff --git a/asdc-tests/src/test/resources/CI/csars/orig2G.csar b/asdc-tests/src/test/resources/CI/csars/orig2G.csar deleted file mode 100644 index 2e8670f1eb..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/orig2G.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/orig2GV001.csar b/asdc-tests/src/test/resources/CI/csars/orig2GV001.csar deleted file mode 100644 index e6e545ea2f..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/orig2GV001.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/orig2GV001_a.csar b/asdc-tests/src/test/resources/CI/csars/orig2GV001_a.csar deleted file mode 100644 index d5a7b47b70..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/orig2GV001_a.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/orig2GV006-remove-all-nested-artifacts.csar b/asdc-tests/src/test/resources/CI/csars/orig2GV006-remove-all-nested-artifacts.csar deleted file mode 100644 index 88cebe44f2..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/orig2GV006-remove-all-nested-artifacts.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/orig2GV008-change-nested-oam-fileContent.csar b/asdc-tests/src/test/resources/CI/csars/orig2GV008-change-nested-oam-fileContent.csar deleted file mode 100644 index 7c24de025d..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/orig2GV008-change-nested-oam-fileContent.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/orig2G_a.csar b/asdc-tests/src/test/resources/CI/csars/orig2G_a.csar deleted file mode 100644 index 9af7501b76..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/orig2G_a.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/orig2G_updated.csar b/asdc-tests/src/test/resources/CI/csars/orig2G_updated.csar deleted file mode 100644 index 1a4107811d..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/orig2G_updated.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/valid_vf.csar b/asdc-tests/src/test/resources/CI/csars/valid_vf.csar deleted file mode 100644 index 01bf159071..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/valid_vf.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/valid_vf_a.csar b/asdc-tests/src/test/resources/CI/csars/valid_vf_a.csar deleted file mode 100644 index 01bf159071..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/valid_vf_a.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/valid_vf_b.csar b/asdc-tests/src/test/resources/CI/csars/valid_vf_b.csar deleted file mode 100644 index 3c0b683321..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/valid_vf_b.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/valid_vf_c.csar b/asdc-tests/src/test/resources/CI/csars/valid_vf_c.csar deleted file mode 100644 index 57e3551682..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/valid_vf_c.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/valid_vf_d.csar b/asdc-tests/src/test/resources/CI/csars/valid_vf_d.csar deleted file mode 100644 index d66dfb60d9..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/valid_vf_d.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/valid_vf_f.csar b/asdc-tests/src/test/resources/CI/csars/valid_vf_f.csar deleted file mode 100644 index a9a4bc75ab..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/valid_vf_f.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vf_relate_by_cap_name.csar b/asdc-tests/src/test/resources/CI/csars/vf_relate_by_cap_name.csar deleted file mode 100644 index eec433e8ff..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vf_relate_by_cap_name.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop.csar b/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop.csar deleted file mode 100644 index df98e259d6..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1.csar b/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1.csar deleted file mode 100644 index ce1541f32c..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1_failed.csar b/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1_failed.csar deleted file mode 100644 index a2a9ad77c9..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop1_failed.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop_failed.csar b/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop_failed.csar deleted file mode 100644 index 6e23829e8a..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vf_with_cap_prop_override_cap_type_prop_failed.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vfc_artifacts.csar b/asdc-tests/src/test/resources/CI/csars/vfc_artifacts.csar deleted file mode 100644 index 8b5f58b7ef..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vfc_artifacts.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vfc_artifacts_delete_all.csar b/asdc-tests/src/test/resources/CI/csars/vfc_artifacts_delete_all.csar deleted file mode 100644 index a15e7b46c1..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vfc_artifacts_delete_all.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vfc_artifacts_update.csar b/asdc-tests/src/test/resources/CI/csars/vfc_artifacts_update.csar deleted file mode 100644 index af712f1a59..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vfc_artifacts_update.csar and /dev/null differ diff --git a/asdc-tests/src/test/resources/CI/csars/vmmc_relate_by_cap_name.csar b/asdc-tests/src/test/resources/CI/csars/vmmc_relate_by_cap_name.csar deleted file mode 100644 index b11bd9386a..0000000000 Binary files a/asdc-tests/src/test/resources/CI/csars/vmmc_relate_by_cap_name.csar and /dev/null differ -- cgit 1.2.3-korg