From: Tal Gitelman Date: Tue, 24 Jul 2018 08:47:25 +0000 (+0300) Subject: Update sdc-parser version and allign normatives X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F57315%2F1;p=sdc.git Update sdc-parser version and allign normatives Change-Id: I8fdb3c9a6961c2e8b458e2f2ae931fdf71490cbb Issue-ID: SDC-1544 Signed-off-by: Tal Gitelman --- diff --git a/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip b/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip index ac2d7c8df2..3f623fc972 100644 Binary files a/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip and b/catalog-be/src/main/resources/import/tosca/artifact-types/artifactTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml index 9a6bc093e4..b647651990 100644 --- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml @@ -274,4 +274,4 @@ tosca.capabilities.nfv.ext.Compute.Container.Architecture: type: string mem_size: type: string - required: false \ No newline at end of file + required: false diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip index 8304553483..de4aa48a1d 100644 Binary files a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip and b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip index 897cb36b18..2fc617983c 100644 Binary files a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip and b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip index 84bc0c928d..1c6ad9013e 100644 Binary files a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip and b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip index 3a26c09f43..d7dd67c205 100644 Binary files a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip and b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml index 85cff11c2a..39697c0b68 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml @@ -8,4 +8,4 @@ node_types: cr_role: type: string cr_type: - type: string + type: string \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip index c5dc361e07..092393278d 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip index f1e3fdd173..e5bcd325d2 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml index 6d7818685d..ac169a3748 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.yml @@ -10,5 +10,5 @@ node_types: occurrences: - 1 - UNBOUNDED - capability: org.openecomp.capabilities.VLANAssignment + capability: org.openecomp.capabilities.VLANAssignment relationship: org.openecomp.relationships.AssignsTo \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip index 8ad09ed6b6..cb99fae722 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml index 48db2b609a..7aa7edfe70 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.yml @@ -1,11 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: AbstractSubstituteGlobalTypes - template_version: 1.0.0 -description: Abstract Substitute Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.abstract.nodes.AbstractSubstitute: derived_from: tosca.nodes.Root diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip index 2c38ab43a1..48d1908b8a 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/abstractSubstitute/abstractSubstitute.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml index fb69c6c3b7..87dfc313ae 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.yml @@ -1,7 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 - -description: Contrail Virtual Network Global Types - node_types: org.openecomp.resource.vfc.nodes.heat.cinder.Volume: derived_from: org.openecomp.resource.vfc.nodes.volume diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip index 8b9a455c54..be5bf9d01f 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/cinderVolume/cinderVolume.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml index 88be651474..43fceaf535 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.yml @@ -5,14 +5,14 @@ node_types: properties: type: type: string - description: The type of the node, the configuration will be defined for it. Ex.”SBC” + description: The type of the node, the configuration will be defined for it. Ex.”SBC” required: false role: type: string - description: The role of the node, the configuration will be defined for it. Ex. “Active”, “Standby” + description: The role of the node, the configuration will be defined for it. Ex. “Active”, “Standby” required: false function: type: string - description: The function of the node, the configuration will be defined for it. Ex. “NAT Traversal” + description: The function of the node, the configuration will be defined for it. Ex. “NAT Traversal” required: false diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip index 74f5048d05..cb0d191221 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml index 5bdee932a3..a1f40c5529 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.yml @@ -1,11 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailAbstractSubstituteGlobalTypes - template_version: 1.0.0 -description: Contrail Abstract Substitute Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.abstract.nodes.contrail.AbstractSubstitute: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip index 11d99be2e3..4486fe44e4 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/contrailAbstractSubstitute/contrailAbstractSubstitute.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml index 4ca0f04f6c..c2ba70e2d1 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml @@ -1,13 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailComputeGlobalTypes - template_version: 1.0.0 -description: Contrail Compute TOSCA Global Types -imports: - ComputeGlobalTypes: - file: ComputeGlobalTypesServiceTemplate.yaml - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.contrail.Compute: derived_from: org.openecomp.resource.vfc.nodes.Compute diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip index c0cc411e5d..06fb34db51 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml index b9d61e7769..2f8228ac85 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.yml @@ -1,11 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailNetworkRuleGlobalType - template_version: 1.0.0 -description: Contrail Network Rule Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.rules.nodes.heat.network.contrail.NetworkRules: derived_from: tosca.nodes.Root diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip index 639164711f..633f7c7659 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/contrailNetworkRules/contrailNetworkRules.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml index 84717a40c3..ce99511bbe 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailPort/contrailPort.yml @@ -1,13 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailPortGlobalTypes - template_version: 1.0.0 -description: Contrail Port TOSCA Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml - PortGlobalTypes: - file: PortGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.cp.nodes.heat.network.contrail.Port: derived_from: org.openecomp.resource.cp.nodes.network.Port diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml index ccc6d3a2ab..ad4369ce40 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2NetworkRules/contrailV2NetworkRules.yml @@ -1,11 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailV2NetworkRuleGlobalType - template_version: 1.0.0 -description: Contrail V2 Network Rule Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.rules.nodes.heat.network.contrailV2.NetworkRules: derived_from: tosca.nodes.Root diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip index 856457979e..054af8b190 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml index cfff898077..0fa7c94a63 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.yml @@ -1,76 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailV2VirtualNetworkGlobalType - template_version: 1.0.0 -description: Contrail V2 Virtual Network Global Types -imports: - NetworkGlobalTypes: - file: NetworkGlobalTypesServiceTemplate.yaml - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml -data_types: - org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData: - derived_from: tosca.datatypes.Root - description: network policy refs data - properties: - network_policy_refs_data_sequence: - type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence - description: Network Policy ref data sequence - required: false - status: SUPPORTED - org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence: - derived_from: tosca.datatypes.Root - description: network policy refs data sequence - properties: - network_policy_refs_data_sequence_major: - type: integer - description: Network Policy ref data sequence Major - required: false - status: SUPPORTED - network_policy_refs_data_sequence_minor: - type: integer - description: Network Policy ref data sequence Minor - required: false - status: SUPPORTED - org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet: - derived_from: tosca.datatypes.Root - description: Network Ipam Ref Data Subnet - properties: - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len: - type: string - description: Network ipam refs data ipam subnets ip prefix len - required: false - status: SUPPORTED - network_ipam_refs_data_ipam_subnets_subnet_ip_prefix: - type: string - description: Network ipam refs data ipam subnets ip prefix - required: false - status: SUPPORTED - org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData: - derived_from: tosca.datatypes.Root - description: Network Ipam Ref Data - properties: - network_ipam_refs_data_ipam_subnets: - type: list - description: Network ipam refs data ipam subnets - required: false - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList - org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList: - derived_from: tosca.datatypes.Root - description: Network Ipam Ref Data Subnet List - properties: - network_ipam_refs_data_ipam_subnets_subnet: - type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet - description: Network ipam refs data ipam subnets - required: false - status: SUPPORTED - network_ipam_refs_data_ipam_subnets_addr_from_start: - type: string - description: Network ipam refs data ipam subnets addr from start - required: false - status: SUPPORTED node_types: org.openecomp.resource.vl.nodes.heat.network.contrailV2.VirtualNetwork: derived_from: org.openecomp.resource.vl.nodes.network.Network diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip index 43f499bdbb..ab6f90eb1f 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualNetwork/contrailV2VirtualNetwork.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml index f1ebbea138..c0d1f3dab2 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailVirtualNetwork/contrailVirtualNetwork.yml @@ -1,13 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailVirtualNetworkGlobalType - template_version: 1.0.0 -description: Contrail Virtual Network Global Types -imports: - NetworkGlobalTypes: - file: NetworkGlobalTypesServiceTemplate.yaml - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork: derived_from: org.openecomp.resource.vl.nodes.network.Network diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip index 944dfb71fc..8a790a546f 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml index ee7ced6a44..4ac9950ee2 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.yml @@ -1,11 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ComputeGlobalTypes - template_version: 1.0.0 -description: Compute TOSCA Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.Compute: derived_from: tosca.nodes.Compute diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip index b0929ff6a0..f54d7d2c1b 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml index f5cf4fc642..539e33991f 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.yml @@ -1,13 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: NeutronNetGlobalTypes - template_version: 1.0.0 -description: Neutron Network TOSCA Global Types -imports: - NetworkGlobalTypes: - file: NetworkGlobalTypesServiceTemplate.yaml - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vl.nodes.heat.network.neutron.Net: derived_from: org.openecomp.resource.vl.nodes.network.Network diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip index c8368a5923..c85c133155 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/neutronNet/neutronNet.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml index 9451698add..0f6fcb371c 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml @@ -1,28 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: NeutronPortGlobalTypes - template_version: 1.0.0 -description: Neutron Port TOSCA Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml - PortGlobalTypes: - file: PortGlobalTypesServiceTemplate.yaml -data_types: - org.openecomp.datatypes.heat.neutron.port.FixedIps: - derived_from: tosca.datatypes.Root - description: subnet/ip_address - properties: - subnet: - type: string - description: Subnet in which to allocate the IP address for this port - required: false - status: SUPPORTED - ip_address: - type: string - description: IP address desired in the subnet for this port - required: false - status: SUPPORTED node_types: org.openecomp.resource.cp.nodes.heat.network.neutron.Port: derived_from: org.openecomp.resource.cp.nodes.network.Port diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip index 5f33401e6b..884dae17e1 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml index 1cbf98b1cd..2271c9cd06 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.yml @@ -1,74 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: NovaServerGlobalTypes - template_version: 1.0.0 -description: Nova Server TOSCA Global Types -imports: - ComputeGlobalTypes: - file: ComputeGlobalTypesServiceTemplate.yaml - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml -data_types: - org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties: - derived_from: tosca.datatypes.Root - description: Nova server network expand properties for port - properties: - port_security_enabled: - type: boolean - description: Flag to enable/disable port security on the port - required: false - status: SUPPORTED - mac_address: - type: string - description: MAC address to give to this port - required: false - status: SUPPORTED - admin_state_up: - type: boolean - description: The administrative state of this port - required: false - default: true - status: SUPPORTED - qos_policy: - type: string - description: The name or ID of QoS policy to attach to this port - required: false - status: SUPPORTED - allowed_address_pairs: - type: list - description: Additional MAC/IP address pairs allowed to pass through the port - required: false - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - binding:vnic_type: - type: string - description: The vnic type to be bound on the neutron port - required: false - status: SUPPORTED - constraints: - - valid_values: - - macvtap - - direct - - normal - value_specs: - type: map - description: Extra parameters to include in the request - required: false - default: { - } - status: SUPPORTED - entry_schema: - type: string - org.openecomp.datatypes.heat.novaServer.network.AddressInfo: - derived_from: tosca.datatypes.network.NetworkInfo - description: Network addresses with corresponding port id - properties: - port_id: - type: string - description: Port id - required: false - status: SUPPORTED node_types: org.openecomp.resource.vfc.nodes.heat.nova.Server: derived_from: org.openecomp.resource.vfc.nodes.Compute diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip index 54274e78f5..1adb0ded4c 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/novaServer/novaServer.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml index 8fd19097ef..876b2f1388 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.yml @@ -1,11 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: NeutronSecurityRulesGlobalTypes - template_version: 1.0.0 -description: Neutron Security Rules TOSCA Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules: derived_from: tosca.nodes.Root diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip index 607fe0c930..94bcddfa19 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/securityRules/securityRules.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.yml b/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.yml index 6f2d26afb9..2356f82995 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.yml @@ -1,11 +1,4 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: SubInterfaceGlobalTypes - template_version: 1.0.0 -description: Sub Interafce TOSCA Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.cp.nodes.network.SubInterface: derived_from: tosca.nodes.network.Port \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip b/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip index 54fb2ffb80..51bfe51d32 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/subInterface/subInterface.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip index f9894d68bf..e18013a719 100644 Binary files a/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip and b/catalog-be/src/main/resources/import/tosca/interface-lifecycle-types/interfaceLifecycleTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml index 541126f7e3..68ecf90104 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.yml @@ -3,19 +3,9 @@ node_types: tosca.nodes.nfv.VDU: derived_from: tosca.nodes.SoftwareComponent capabilities: -#Not found in any spec -# high_availability: -# type: nfv.capabilities.HA Virtualbinding: type: tosca.capabilities.nfv.VirtualBindable -# monitoring_parameter: -# type: nfv.capabilities.Metric requirements: -#Not found in any spec -# - high_availability: -# capability: nfv.capabilities.HA -# relationship: nfv.relationships.HA -# occurrences: [ 0, 1 ] - host: capability: tosca.capabilities.Container node: tosca.nodes.Compute diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip index 9010bf0544..32487dc65c 100644 Binary files a/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip and b/catalog-be/src/main/resources/import/tosca/nfv-types/VDU/VDU.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml index cf7b5cc490..00d3bd243d 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.yml @@ -34,4 +34,5 @@ node_types: - service_dependency: capability: org.openecomp.capabilities.AllottedResource relationship: tosca.relationships.DependsOn + node: tosca.services.Root diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip index 1417651d5f..fd3f7e9d79 100644 Binary files a/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip and b/catalog-be/src/main/resources/import/tosca/nfv-types/allottedResource/allottedResource.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml index 1c461681a2..6924a28901 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml @@ -1,4 +1,3 @@ -#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!! tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: tosca.nodes.nfv.VduCp: @@ -23,11 +22,6 @@ node_types: entry_schema: type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements required: false - # order: #there is no this attribute in IM. - # type: integer - # required: false - # constraints: - # - greater_or_equal: 0 requirements: - virtual_link: capability: tosca.capabilities.nfv.VirtualLinkable diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip index c5a43abf5b..4da5c12ad2 100644 Binary files a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip and b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip b/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip index 3ae6e5d076..dc57864564 100644 Binary files a/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip and b/catalog-be/src/main/resources/import/tosca/normative-types/loadBalancer/loadBalancer.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip index 29dd88e4b3..f1a55ef046 100644 Binary files a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip and b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip index 5db20abb4d..be7dcd0fbb 100644 Binary files a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip and b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip differ diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 1cdefc22bc..d19c6e3a69 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -89,7 +89,7 @@ 9.0.6.v20130930 1.19.1 1.18.1 - RELEASE + 4.12 1.1.2 1.10.19 1.9.13 diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml index 6114876d2d..d9b3676b5d 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/pom.xml @@ -54,7 +54,12 @@ org.testng testng - + + junit + junit + ${junit.version} + test + javax.inject @@ -78,10 +83,4 @@ ${project.version} - - - - - - diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml index 090b02bb68..5376a037fb 100644 --- a/test-apis-ci/pom.xml +++ b/test-apis-ci/pom.xml @@ -307,7 +307,7 @@ org.onap.sdc.sdc-tosca sdc-tosca - 1.3.5 + 1.4.1-SNAPSHOT compile diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java index a464eb1bdf..8270515643 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/CsarToscaTester.java @@ -6,14 +6,14 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.openecomp.sdc.tosca.parser.impl.SdcTypes; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.NodeTemplate; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; -import org.openecomp.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.tosca.parser.impl.SdcTypes; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.toscaparser.api.parameters.Input; public class CsarToscaTester { diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java index e81c63fa53..36fdf06a36 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/AtomicOperationUtils.java @@ -93,8 +93,8 @@ import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils; import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser; import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils; import org.openecomp.sdc.common.api.ArtifactGroupTypeEnum; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; import org.testng.SkipException; import com.aventstack.extentreports.Status; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java index 14583607c7..324966c105 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/ToscaValidationTest.java @@ -25,11 +25,11 @@ import org.openecomp.sdc.ci.tests.utils.general.ElementFactory; import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtillViaApis; import org.openecomp.sdc.ci.tests.utils.rest.PropertyRestUtils; import org.openecomp.sdc.ci.tests.verificator.ToscaValidation; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.NodeTemplate; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.sdc.toscaparser.api.elements.Metadata; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java index 203368d361..1c44f1ab4c 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ToscaValidation.java @@ -5,11 +5,11 @@ import fj.data.Either; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest; import org.openecomp.sdc.ci.tests.tosca.datatypes.*; -import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; -import org.openecomp.sdc.toscaparser.api.Group; -import org.openecomp.sdc.toscaparser.api.Property; -import org.openecomp.sdc.toscaparser.api.elements.Metadata; -import org.openecomp.sdc.toscaparser.api.parameters.Input; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.toscaparser.api.Group; +import org.onap.sdc.toscaparser.api.Property; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.toscaparser.api.parameters.Input; import java.lang.reflect.Field; import java.util.HashMap;