From 280f8015d06af1f41a3ef12e8300801c7a5e0d54 Mon Sep 17 00:00:00 2001 From: AviZi Date: Fri, 9 Jun 2017 02:39:56 +0300 Subject: [SDC-29] Amdocs OnBoard 1707 initial commit. Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370 Signed-off-by: AviZi --- .../NestedServiceTemplateReqTest.yaml | 20 ++++++++++---------- .../ServiceTemplateSubstituteTest.yaml | 18 +++++++++--------- .../toscasubstitution/MainServiceTemplate.yaml | 18 +++++++++--------- .../toscasubstitution/nestedServiceTemplate.yaml | 20 ++++++++++---------- ...AbstractSubstituteGlobalTypesServiceTemplate.yaml | 2 +- .../CinderVolumeGlobalTypesServiceTemplate.yaml | 2 +- ...ContrailNetworkRuleGlobalTypeServiceTemplate.yaml | 2 +- ...trailVirtualNetworkGlobalTypeServiceTemplate.yaml | 2 +- .../GlobalSubstitutionTypesServiceTemplate.yaml | 18 +++++++++--------- .../NeutronNetGlobalTypesServiceTemplate.yaml | 2 +- .../NeutronPortGlobalTypesServiceTemplate.yaml | 2 +- ...utronSecurityRulesGlobalTypesServiceTemplate.yaml | 2 +- .../NovaServerGlobalTypesServiceTemplate.yaml | 2 +- .../test/resources/mock/model/serviceTemplate.yaml | 4 ++-- .../mock/model/serviceTemplateHeatExtend.yaml | 8 ++++++-- 15 files changed, 63 insertions(+), 59 deletions(-) (limited to 'openecomp-be/lib/openecomp-tosca-lib/src/test/resources') diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml index f64cb709f0..ce02d0c034 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/NestedServiceTemplateReqTest.yaml @@ -2,25 +2,25 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested imports: - NeutronPortGlobalTypes: +- NeutronPortGlobalTypes: file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: +- NeutronNetGlobalTypes: file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: +- CommonGlobalTypes: file: CommonGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: +- CinderVolumeGlobalTypes: file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: +- ContrailNetworkRuleGlobalType: file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: +- NeutronSecurityRulesGlobalTypes: file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: +- NovaServerGlobalTypes: file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: +- ContrailVirtualNetworkGlobalType: file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: +- AbstractSubstituteGlobalTypes: file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - nested: +- nested: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.cmaui_image: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateSubstituteTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateSubstituteTest.yaml index c4df76a1aa..8d63ac21ae 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateSubstituteTest.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateSubstituteTest.yaml @@ -2,23 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - NeutronPortGlobalTypes: +- NeutronPortGlobalTypes: file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: +- NeutronNetGlobalTypes: file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: +- CommonGlobalTypes: file: CommonGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: +- CinderVolumeGlobalTypes: file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: +- ContrailNetworkRuleGlobalType: file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: +- NeutronSecurityRulesGlobalTypes: file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: +- NovaServerGlobalTypes: file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: +- ContrailVirtualNetworkGlobalType: file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: +- AbstractSubstituteGlobalTypes: file: AbstractSubstituteGlobalTypesServiceTemplate.yaml topology_template: inputs: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/MainServiceTemplate.yaml index 65b90ef5b1..c9affb7442 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/MainServiceTemplate.yaml @@ -2,23 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: Main imports: - NeutronPortGlobalTypes: +- NeutronPortGlobalTypes: file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: +- NeutronNetGlobalTypes: file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: +- CommonGlobalTypes: file: CommonGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: +- CinderVolumeGlobalTypes: file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: +- ContrailNetworkRuleGlobalType: file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: +- NeutronSecurityRulesGlobalTypes: file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: +- NovaServerGlobalTypes: file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: +- ContrailVirtualNetworkGlobalType: file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: +- AbstractSubstituteGlobalTypes: file: AbstractSubstituteGlobalTypesServiceTemplate.yaml topology_template: inputs: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/nestedServiceTemplate.yaml index cd27e7ba1a..9c6c7311d0 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/toscasubstitution/nestedServiceTemplate.yaml @@ -2,25 +2,25 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: nested imports: - NeutronPortGlobalTypes: +- NeutronPortGlobalTypes: file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: +- NeutronNetGlobalTypes: file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: +- CommonGlobalTypes: file: CommonGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: +- CinderVolumeGlobalTypes: file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: +- ContrailNetworkRuleGlobalType: file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: +- NeutronSecurityRulesGlobalTypes: file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: +- NovaServerGlobalTypes: file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: +- ContrailVirtualNetworkGlobalType: file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: +- AbstractSubstituteGlobalTypes: file: AbstractSubstituteGlobalTypesServiceTemplate.yaml - nested: +- nested: file: GlobalSubstitutionTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.cmaui_image: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml index 8813b0abf6..449f0939ee 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/AbstractSubstituteGlobalTypesServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Abstract Substitute Global Types imports: - common_definitions: +- common_definitions: file: CommonGlobalTypesServiceTemplate.yaml data_types: org.openecomp.datatypes.heat.substitution.SubstitutionFilter: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml index 3ef94f22e7..9b0655bf36 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CinderVolumeGlobalTypesServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Cinder Volume TOSCA Global Types relationship_types: - org.openecomp.relationships.heat.cinder.VolumeAttachesTo: + org.openecomp.relationships.VolumeAttachesTo: derived_from: tosca.relationships.AttachesTo description: This type represents an attachment relationship for associating volume properties: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml index 98317310fa..044d759bc0 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailNetworkRuleGlobalTypeServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Contrail Network Rule Global Types imports: - common_definitions: +- common_definitions: file: CommonGlobalTypesServiceTemplate.yaml data_types: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml index 0927e3dd0e..cbbb979029 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Contrail Virtual Network Global Types imports: - common_definitions: +- common_definitions: file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml index 08c47bc646..1ce3fc54ff 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/GlobalSubstitutionTypesServiceTemplate.yaml @@ -2,23 +2,23 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 metadata: template_name: GlobalSubstitutionTypes imports: - NeutronPortGlobalTypes: +- NeutronPortGlobalTypes: file: NeutronPortGlobalTypesServiceTemplate.yaml - NeutronNetGlobalTypes: +- NeutronNetGlobalTypes: file: NeutronNetGlobalTypesServiceTemplate.yaml - CommonGlobalTypes: +- CommonGlobalTypes: file: CommonGlobalTypesServiceTemplate.yaml - CinderVolumeGlobalTypes: +- CinderVolumeGlobalTypes: file: CinderVolumeGlobalTypesServiceTemplate.yaml - ContrailNetworkRuleGlobalType: +- ContrailNetworkRuleGlobalType: file: ContrailNetworkRuleGlobalTypeServiceTemplate.yaml - NeutronSecurityRulesGlobalTypes: +- NeutronSecurityRulesGlobalTypes: file: NeutronSecurityRulesGlobalTypesServiceTemplate.yaml - NovaServerGlobalTypes: +- NovaServerGlobalTypes: file: NovaServerGlobalTypesServiceTemplate.yaml - ContrailVirtualNetworkGlobalType: +- ContrailVirtualNetworkGlobalType: file: ContrailVirtualNetworkGlobalTypeServiceTemplate.yaml - AbstractSubstituteGlobalTypes: +- AbstractSubstituteGlobalTypes: file: AbstractSubstituteGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.abstract.nodes.heat.nested: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml index e80e2727c7..494b44c126 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronNetGlobalTypesServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Neutron Network TOSCA Global Types imports: - common_definitions: +- common_definitions: file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vl.nodes.heat.network.neutron.Net: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml index a337d6ed18..a561d79b8f 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronPortGlobalTypesServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Neutron Port TOSCA Global Types imports: - common_definitions: +- common_definitions: file: CommonGlobalTypesServiceTemplate.yaml data_types: org.openecomp.datatypes.heat.neutron.port.FixedIps: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml index 49c9a102c8..83fc31520a 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NeutronSecurityRulesGlobalTypesServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Neutron Security Rules TOSCA Global Types imports: - common_definitions: +- common_definitions: file: CommonGlobalTypesServiceTemplate.yaml data_types: org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml index 2253a1e4af..d77e378a79 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NovaServerGlobalTypesServiceTemplate.yaml @@ -4,7 +4,7 @@ metadata: template_version: 1.0.0 description: Nova Server TOSCA Global Types imports: - common_definitions: +- common_definitions: file: CommonGlobalTypesServiceTemplate.yaml data_types: org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml index 612bc2d2fa..2fb8042e00 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplate.yaml @@ -5,9 +5,9 @@ metadata: template_version: 1.0.0 description: testing desc tosca service template imports: - myfile1: +- myfile1: file: path1/path2/file1.yaml - myfile2: +- myfile2: file: path1/path2/file2.yaml artifact_types: one_artifact: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml index 4515e3dee3..6f34a76ab4 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateHeatExtend.yaml @@ -5,9 +5,9 @@ metadata: template_version: 1.0.0 description: testing desc tosca service template imports: - myfile1: +- myfile1: file: path1/path2/file1.yaml - myfile2: +- myfile2: file: path1/path2/file2.yaml artifact_types: one_artifact: @@ -57,6 +57,10 @@ node_types: topology_template: description: topologi template descroption inputs: + OS::stack_name: + type: string + description: desc + required: false inParam1: type: string description: desc -- cgit 1.2.3-korg