From c42c9f75adb72f80e57694b5bf67db7c94f33a89 Mon Sep 17 00:00:00 2001 From: aribeiro Date: Thu, 26 Sep 2019 13:20:28 +0100 Subject: Fix for status properties value. These changes were made to align the normative types to the TOSCA property definition requirements. Issue-ID: SDC-322 Change-Id: I32e815dd26990dd6c82c859ad051b271db3c8029 Signed-off-by: aribeiro --- .../NestedServiceTemplateReqTest.yaml | 10 ++-- .../ServiceTemplateDatatypeFlatTest.yaml | 4 +- .../ServiceTemplateFileNotFoundTest.yaml | 10 ++-- .../ServiceTemplateInterfaceInheritanceTest.yaml | 10 ++-- ...stractSubstituteGlobalTypesServiceTemplate.yaml | 10 ++-- .../CinderVolumeGlobalTypesServiceTemplate.yaml | 60 +++++++++---------- .../CommonGlobalTypesServiceTemplate.yaml | 52 ++++++++--------- ...ntrailNetworkRuleGlobalTypeServiceTemplate.yaml | 28 ++++----- ...ailVirtualNetworkGlobalTypeServiceTemplate.yaml | 18 +++--- .../NativeTypesServiceTemplateServiceTemplate.yaml | 50 ++++++++-------- .../NeutronNetGlobalTypesServiceTemplate.yaml | 28 ++++----- .../NeutronPortGlobalTypesServiceTemplate.yaml | 44 +++++++------- ...ronSecurityRulesGlobalTypesServiceTemplate.yaml | 24 ++++---- .../NovaServerGlobalTypesServiceTemplate.yaml | 68 +++++++++++----------- .../test/resources/mock/model/serviceTemplate.yaml | 4 +- .../mock/model/serviceTemplateHeatExtend.yaml | 4 +- .../mock/model/serviceTemplateWithInterface.yaml | 4 +- .../serviceTemplateWithInterfaceAndOperation.yaml | 4 +- .../serviceTemplateWithNodeTemplateInterface.yaml | 4 +- .../serviceTemplateWithNodeTypeInterface.yaml | 4 +- .../model/serviceTemplateWithServiceFilter.yaml | 4 +- 21 files changed, 222 insertions(+), 222 deletions(-) (limited to 'openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock') 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 8022d996b7..81202230d9 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 @@ -29,13 +29,13 @@ node_types: admin_pass: description: The administrator password for the server type: string - status: SUPPORTED + status: supported default: overridden default value required: false new_property: description: new property type: string - status: SUPPORTED + status: supported required: false data_types: org.openecomp.datatypes.heat.network.MyAddressPair: @@ -45,13 +45,13 @@ data_types: mac_address: description: MAC address type: string - status: SUPPORTED + status: supported required: false default: overridden default value new_property: description: new property type: string - status: SUPPORTED + status: supported required: false org.openecomp.datatypes.heat.network.MyNewAddressPair: derived_from: org.openecomp.datatypes.heat.network.MyAddressPair @@ -60,7 +60,7 @@ data_types: mac_address: description: MAC address type: string - status: SUPPORTED + status: supported required: true default: overridden default value topology_template: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml index d7dcdca111..8eea5c90cf 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateDatatypeFlatTest.yaml @@ -29,13 +29,13 @@ node_types: admin_pass: description: The administrator password for the server type: string - status: SUPPORTED + status: supported default: overridden default value required: false new_property: description: new property type: string - status: SUPPORTED + status: supported required: false data_types: org.openecomp.datatypes.heat.network.MyString: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml index 37b242b53f..32c2ba824e 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateFileNotFoundTest.yaml @@ -11,13 +11,13 @@ node_types: admin_pass: description: The administrator password for the server type: string - status: SUPPORTED + status: supported default: overridden default value required: false new_property: description: new property type: string - status: SUPPORTED + status: supported required: false data_types: org.openecomp.datatypes.heat.network.MyAddressPair: @@ -27,13 +27,13 @@ data_types: mac_address: description: MAC address type: string - status: SUPPORTED + status: supported required: false default: overridden default value new_property: description: new property type: string - status: SUPPORTED + status: supported required: false org.openecomp.datatypes.heat.network.MyNewAddressPair: derived_from: org.openecomp.datatypes.heat.network.MyAddressPair @@ -42,7 +42,7 @@ data_types: mac_address: description: MAC address type: string - status: SUPPORTED + status: supported required: true default: overridden default value topology_template: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml index 3df6798b6c..d9eac6a006 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/analyzerService/ServiceTemplateInterfaceInheritanceTest.yaml @@ -11,13 +11,13 @@ node_types: admin_pass: description: The administrator password for the server type: string - status: SUPPORTED + status: supported default: overridden default value required: false new_property: description: new property type: string - status: SUPPORTED + status: supported required: false interfaces: Standard: @@ -89,13 +89,13 @@ data_types: mac_address: description: MAC address type: string - status: SUPPORTED + status: supported required: false default: overridden default value new_property: description: new property type: string - status: SUPPORTED + status: supported required: false org.openecomp.datatypes.heat.network.MyNewAddressPair: derived_from: org.openecomp.datatypes.heat.network.MyAddressPair @@ -104,7 +104,7 @@ data_types: mac_address: description: MAC address type: string - status: SUPPORTED + status: supported required: true default: overridden default value interface_types: 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 449f0939ee..400a13bf16 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 @@ -15,13 +15,13 @@ data_types: type: string description: Substitute Service Template required: true - status: SUPPORTED + status: supported index_variable: type: string description: Index variable required: false default: '%index%' - status: SUPPORTED + status: supported constraints: - min_length: 3 count: @@ -29,13 +29,13 @@ data_types: description: Count required: false default: 1 - status: SUPPORTED + status: supported mandatory: type: boolean description: Mandatory required: false default: true - status: SUPPORTED + status: supported node_types: org.openecomp.resource.abstract.nodes.AbstractSubstitute: derived_from: tosca.nodes.Root @@ -44,4 +44,4 @@ node_types: type: org.openecomp.datatypes.heat.substitution.SubstitutionFilter description: Substitution Filter required: true - status: SUPPORTED \ No newline at end of file + status: supported \ No newline at end of file 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 9b0655bf36..3c15fd818d 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 @@ -12,22 +12,22 @@ relationship_types: type: string description: The ID of the volume to be attached required: true - status: SUPPORTED + status: supported location: type: string description: The location where the volume is exposed on the instance, mountpoint required: false - status: SUPPORTED + status: supported instance_uuid: type: string description: The ID of the server to which the volume attaches required: true - status: SUPPORTED + status: supported attributes: show: type: string description: Detailed information about resource - status: SUPPORTED + status: supported node_types: org.openecomp.resource.vfc.nodes.heat.cinder.Volume: derived_from: tosca.nodes.BlockStorage @@ -36,34 +36,34 @@ node_types: type: string description: The availability zone in which the volume will be created required: false - status: SUPPORTED + status: supported image: type: string description: If specified, the name or ID of the image to create the volume from required: false - status: SUPPORTED + status: supported metadata: type: map description: Key/value pairs to associate with the volume required: false - status: SUPPORTED + status: supported entry_schema: type: string volume_type: type: string description: If specified, the type of volume to use, mapping to a specific backend required: false - status: SUPPORTED + status: supported description: type: string description: A description of the volume required: false - status: SUPPORTED + status: supported device_type: type: string description: Device type required: false - status: SUPPORTED + status: supported constraints: - valid_values: - cdrom @@ -73,7 +73,7 @@ node_types: description: 'Bus of the device: hypervisor driver chooses a suitable default if omitted' required: false - status: SUPPORTED + status: supported constraints: - valid_values: - ide @@ -85,92 +85,92 @@ node_types: type: string description: If specified, the backup to create the volume from required: false - status: SUPPORTED + status: supported source_volid: type: string description: If specified, the volume to use as source required: false - status: SUPPORTED + status: supported boot_index: type: integer description: Integer used for ordering the boot disks required: false - status: SUPPORTED + status: supported size: type: scalar-unit.size description: The requested storage size (default unit is MB) required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 1 GB read_only: type: boolean description: Enables or disables read-only access mode of volume required: false - status: SUPPORTED + status: supported name: type: string description: A name used to distinguish the volume required: false - status: SUPPORTED + status: supported scheduler_hints: type: map description: Arbitrary key-value pairs specified by the client to help the Cinder scheduler creating a volume required: false - status: SUPPORTED + status: supported entry_schema: type: string swap_size: type: scalar-unit.size description: The size of the swap, in MB required: false - status: SUPPORTED + status: supported delete_on_termination: type: boolean description: Indicate whether the volume should be deleted when the server is terminated required: false - status: SUPPORTED + status: supported multiattach: type: boolean description: Whether allow the volume to be attached more than once required: false - status: SUPPORTED + status: supported attributes: display_description: type: string description: Description of the volume - status: SUPPORTED + status: supported attachments: type: string description: The list of attachments of the volume - status: SUPPORTED + status: supported entry_schema: type: string encrypted: type: boolean description: Boolean indicating if the volume is encrypted or not - status: SUPPORTED + status: supported show: type: string description: Detailed information about resource - status: SUPPORTED + status: supported created_at: type: timestamp description: The timestamp indicating volume creation - status: SUPPORTED + status: supported display_name: type: string description: Name of the volume - status: SUPPORTED + status: supported metadata_values: type: map description: Key/value pairs associated with the volume in raw dict form - status: SUPPORTED + status: supported bootable: type: boolean description: Boolean indicating if the volume can be booted or not - status: SUPPORTED + status: supported status: type: string description: The current status of the volume - status: SUPPORTED + status: supported diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml index 5b85d5047b..f8af9c1bb7 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/CommonGlobalTypesServiceTemplate.yaml @@ -15,12 +15,12 @@ data_types: type: string description: MAC address required: false - status: SUPPORTED + status: supported ip_address: type: string description: IP address required: false - status: SUPPORTED + status: supported org.openecomp.datatypes.heat.network.subnet.HostRoute: derived_from: tosca.datatypes.Root description: Host route info for the subnet @@ -29,12 +29,12 @@ data_types: type: string description: The destination for static route required: false - status: SUPPORTED + status: supported nexthop: type: string description: The next hop for the destination required: false - status: SUPPORTED + status: supported org.openecomp.datatypes.heat.network.neutron.Subnet: derived_from: tosca.datatypes.Root description: A subnet represents an IP address block that can be used for assigning IP addresses to virtual instances @@ -43,18 +43,18 @@ data_types: type: string description: The ID of the tenant who owns the network required: false - status: SUPPORTED + status: supported enable_dhcp: type: boolean description: Set to true if DHCP is enabled and false if DHCP is disabled required: false default: true - status: SUPPORTED + status: supported ipv6_address_mode: type: string description: IPv6 address mode required: false - status: SUPPORTED + status: supported constraints: - valid_values: - dhcpv6-stateful @@ -64,7 +64,7 @@ data_types: type: string description: IPv6 RA (Router Advertisement) mode required: false - status: SUPPORTED + status: supported constraints: - valid_values: - dhcpv6-stateful @@ -76,35 +76,35 @@ data_types: required: false default: { } - status: SUPPORTED + status: supported entry_schema: type: string allocation_pools: type: list description: The start and end addresses for the allocation pools required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.network.AllocationPool subnetpool: type: string description: The name or ID of the subnet pool required: false - status: SUPPORTED + status: supported dns_nameservers: type: list description: A specified set of DNS name servers to be used required: false default: [ ] - status: SUPPORTED + status: supported entry_schema: type: string host_routes: type: list description: The gateway IP address required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.network.subnet.HostRoute ip_version: @@ -112,7 +112,7 @@ data_types: description: The gateway IP address required: false default: 4 - status: SUPPORTED + status: supported constraints: - valid_values: - '4' @@ -121,24 +121,24 @@ data_types: type: string description: The name of the subnet required: false - status: SUPPORTED + status: supported prefixlen: type: integer description: Prefix length for subnet allocation from subnet pool required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0 cidr: type: string description: The CIDR required: false - status: SUPPORTED + status: supported gateway_ip: type: string description: The gateway IP address required: false - status: SUPPORTED + status: supported org.openecomp.datatypes.heat.network.AllocationPool: derived_from: tosca.datatypes.Root description: The start and end addresses for the allocation pool @@ -147,12 +147,12 @@ data_types: type: string description: Start address for the allocation pool required: false - status: SUPPORTED + status: supported end: type: string description: End address for the allocation pool required: false - status: SUPPORTED + status: supported relationship_types: org.openecomp.relationships.AttachesTo: derived_from: tosca.relationships.Root @@ -166,12 +166,12 @@ group_types: type: string description: Heat file which associate to this group/heat stack required: true - status: SUPPORTED + status: supported description: type: string description: Heat file description required: false - status: SUPPORTED + status: supported policy_types: org.openecomp.policies.placement.Colocate: derived_from: tosca.policy.placement @@ -181,12 +181,12 @@ policy_types: type: string description: The name of the policy required: false - status: SUPPORTED + status: supported affinity: type: string description: affinity required: true - status: SUPPORTED + status: supported constraints: - valid_values: - host @@ -200,12 +200,12 @@ policy_types: type: string description: The name of the policy required: false - status: SUPPORTED + status: supported container_type: type: string description: container type required: false - status: SUPPORTED + status: supported constraints: - valid_values: - host 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 044d759bc0..8e85521225 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 @@ -15,12 +15,12 @@ data_types: type: string description: Start port required: false - status: SUPPORTED + status: supported end_port: type: string description: End port required: false - status: SUPPORTED + status: supported org.openecomp.datatypes.heat.contrail.network.rule.Rule: derived_from: tosca.datatypes.Root description: policy rule @@ -29,45 +29,45 @@ data_types: type: list description: Source ports required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs protocol: type: string description: Protocol required: false - status: SUPPORTED + status: supported dst_addresses: type: list description: Destination addresses required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork apply_service: type: string description: Service to apply required: false - status: SUPPORTED + status: supported dst_ports: type: list description: Destination ports required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs src_addresses: type: list description: Source addresses required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork direction: type: string description: Direction required: false - status: SUPPORTED + status: supported org.openecomp.datatypes.heat.contrail.network.rule.RuleList: derived_from: tosca.datatypes.Root description: list of policy rules @@ -76,7 +76,7 @@ data_types: type: list description: Contrail network rule required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.contrail.network.rule.Rule org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork: @@ -87,7 +87,7 @@ data_types: type: string description: Virtual network required: false - status: SUPPORTED + status: supported node_types: org.openecomp.resource.nodes.heat.network.contrail.NetworkRules: derived_from: tosca.nodes.Root @@ -96,17 +96,17 @@ node_types: type: org.openecomp.datatypes.heat.contrail.network.rule.RuleList description: A symbolic name for this contrail network rule required: false - status: SUPPORTED + status: supported name: type: string description: A symbolic name for this contrail network rule required: false - status: SUPPORTED + status: supported attributes: fq_name: type: string description: fq_name - status: SUPPORTED + status: supported requirements: - network: capability: tosca.capabilities.Attachment 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 cbbb979029..418588a93b 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 @@ -14,53 +14,53 @@ node_types: type: string description: Is virtual network shared required: false - status: SUPPORTED + status: supported forwarding_mode: type: string description: forwarding mode of the virtual network required: false - status: SUPPORTED + status: supported external: type: string description: Is virtual network external required: false - status: SUPPORTED + status: supported flood_unknown_unicast: type: string description: flood L2 packets on network required: false - status: SUPPORTED + status: supported route_targets: type: list description: route targets associated with the virtual network required: false - status: SUPPORTED + status: supported entry_schema: type: string subnets: type: map description: Network related subnets required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.network.neutron.Subnet attributes: subnets_name: type: list description: Subnets name of this network - status: SUPPORTED + status: supported entry_schema: type: string subnets_show: type: map description: Detailed information about each subnet - status: SUPPORTED + status: supported entry_schema: type: string subnets: type: map description: Network related subnets - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.network.neutron.Subnet capabilities: diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml index e7dfd49ed9..4b26de1ba0 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/globalServiceTemplates/NativeTypesServiceTemplateServiceTemplate.yaml @@ -10,21 +10,21 @@ node_types: private_address: type: string description: private address - status: SUPPORTED + status: supported public_address: type: string description: public_address - status: SUPPORTED + status: supported networks: type: map description: networks - status: SUPPORTED + status: supported entry_schema: type: tosca.datatypes.network.NetworkInfo ports: type: map description: ports - status: SUPPORTED + status: supported entry_schema: type: tosca.datatypes.network.PortInfo requirements: @@ -69,25 +69,25 @@ node_types: ip_range_end: type: string required: false - status: SUPPORTED + status: supported ip_range_start: type: string required: false - status: SUPPORTED + status: supported ip_address: type: string required: false - status: SUPPORTED + status: supported is_default: type: boolean required: false default: false - status: SUPPORTED + status: supported order: type: integer required: true default: 0 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 0 requirements: @@ -104,15 +104,15 @@ node_types: tosca_name: type: string description: tosca name - status: SUPPORTED + status: supported state: type: string description: state - status: SUPPORTED + status: supported tosca_id: type: string description: tosca id - status: SUPPORTED + status: supported interfaces: { } tosca.nodes.network.Network: @@ -121,20 +121,20 @@ node_types: physical_network: type: string required: false - status: SUPPORTED + status: supported segmentation_id: type: string required: false - status: SUPPORTED + status: supported network_id: type: string required: false - status: SUPPORTED + status: supported ip_version: type: integer required: false default: 4 - status: SUPPORTED + status: supported constraints: - valid_values: - 4 @@ -142,27 +142,27 @@ node_types: start_ip: type: string required: false - status: SUPPORTED + status: supported network_name: type: string required: false - status: SUPPORTED + status: supported cidr: type: string required: false - status: SUPPORTED + status: supported gateway_ip: type: string required: false - status: SUPPORTED + status: supported network_type: type: string required: false - status: SUPPORTED + status: supported end_ip: type: string required: false - status: SUPPORTED + status: supported capabilities: link: type: tosca.capabilities.network.Linkable @@ -175,17 +175,17 @@ node_types: size: type: scalar-unit.size required: false - status: SUPPORTED + status: supported constraints: - greater_or_equal: 1 MB volume_id: type: string required: false - status: SUPPORTED + status: supported snapshot_id: type: string required: false - status: SUPPORTED + status: supported capabilities: attachment: type: tosca.capabilities.Attachment 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 494b44c126..d9145b77e4 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 @@ -14,41 +14,41 @@ node_types: type: list description: The IDs of the DHCP agent to schedule the network required: false - status: SUPPORTED + status: supported entry_schema: type: string tenant_id: type: string description: The ID of the tenant which will own the network required: false - status: SUPPORTED + status: supported port_security_enabled: type: boolean description: Flag to enable/disable port security on the network required: false - status: SUPPORTED + status: supported shared: type: boolean description: Whether this network should be shared across all tenants required: false default: false - status: SUPPORTED + status: supported admin_state_up: type: boolean description: A boolean value specifying the administrative status of the network required: false default: true - status: SUPPORTED + status: supported qos_policy: type: string description: The name or ID of QoS policy to attach to this network required: false - status: SUPPORTED + status: supported subnets: type: map description: Network related subnets required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.network.neutron.Subnet value_specs: @@ -57,38 +57,38 @@ node_types: required: false default: { } - status: SUPPORTED + status: supported entry_schema: type: string attributes: qos_policy_id: type: string description: The QoS policy ID attached to this network - status: SUPPORTED + status: supported show: type: string description: Detailed information about resource - status: SUPPORTED + status: supported subnets_name: type: list description: Subnets name of this network - status: SUPPORTED + status: supported entry_schema: type: string subnets: type: map description: Network related subnets - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.network.neutron.Subnet mtu: type: scalar-unit.size description: The maximum transmission unit size(in bytes) for the network - status: SUPPORTED + status: supported status: type: string description: The status of the network - status: SUPPORTED + status: supported capabilities: attachment: type: tosca.capabilities.Attachment 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 a561d79b8f..1552aea7a5 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 @@ -15,12 +15,12 @@ data_types: type: string description: Subnet in which to allocate the IP address for this port required: false - status: SUPPORTED + status: supported ip_address: type: string description: IP address desired in the subnet for this port required: false - status: SUPPORTED + status: supported node_types: org.openecomp.resource.cp.nodes.heat.network.neutron.Port: derived_from: tosca.nodes.network.Port @@ -29,29 +29,29 @@ node_types: type: boolean description: Flag to enable/disable port security on the network required: false - status: SUPPORTED + status: supported device_id: type: string description: Device ID of this port required: false - status: SUPPORTED + status: supported qos_policy: type: string description: The name or ID of QoS policy to attach to this network required: false - status: SUPPORTED + status: supported allowed_address_pairs: type: list description: Additional MAC/IP address pairs allowed to pass through the port required: false - status: SUPPORTED + 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 + status: supported constraints: - valid_values: - macvtap @@ -63,25 +63,25 @@ node_types: required: false default: { } - status: SUPPORTED + status: supported entry_schema: type: string device_owner: type: string description: Name of the network owning the port required: false - status: SUPPORTED + status: supported network: type: string description: Network this port belongs to required: false - status: SUPPORTED + status: supported replacement_policy: type: string description: Policy on how to respond to a stack-update for this resource required: false default: AUTO - status: SUPPORTED + status: supported constraints: - valid_values: - REPLACE_ALWAYS @@ -90,59 +90,59 @@ node_types: type: list description: List of security group names or IDs required: false - status: SUPPORTED + status: supported entry_schema: type: string fixed_ips: type: list description: Desired IPs for this port required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps mac_address: type: string description: MAC address to give to this port required: false - status: SUPPORTED + status: supported admin_state_up: type: boolean description: A boolean value specifying the administrative status of the network required: false default: true - status: SUPPORTED + status: supported name: type: string description: A symbolic name for this port required: false - status: SUPPORTED + status: supported attributes: tenant_id: type: string description: Tenant owning the port - status: SUPPORTED + status: supported network_id: type: string description: Unique identifier for the network owning the port - status: SUPPORTED + status: supported qos_policy_id: type: string description: The QoS policy ID attached to this network - status: SUPPORTED + status: supported show: type: string description: Detailed information about resource - status: SUPPORTED + status: supported subnets: type: list description: Subnets of this network - status: SUPPORTED + status: supported entry_schema: type: string status: type: string description: The status of the network - status: SUPPORTED + status: supported capabilities: attachment: type: tosca.capabilities.Attachment 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 83fc31520a..153ee11153 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 @@ -15,12 +15,12 @@ data_types: type: string description: The remote group ID to be associated with this security group rule required: false - status: SUPPORTED + status: supported protocol: type: string description: The protocol that is matched by the security group rule required: false - status: SUPPORTED + status: supported constraints: - valid_values: - tcp @@ -31,7 +31,7 @@ data_types: description: Ethertype of the traffic required: false default: IPv4 - status: SUPPORTED + status: supported constraints: - valid_values: - IPv4 @@ -41,7 +41,7 @@ data_types: description: 'The maximum port number in the range that is matched by the security group rule. ' required: false - status: SUPPORTED + status: supported constraints: - in_range: - 0 @@ -50,13 +50,13 @@ data_types: type: string description: The remote IP prefix (CIDR) to be associated with this security group rule required: false - status: SUPPORTED + status: supported remote_mode: type: string description: Whether to specify a remote group or a remote IP prefix required: false default: remote_ip_prefix - status: SUPPORTED + status: supported constraints: - valid_values: - remote_ip_prefix @@ -66,7 +66,7 @@ data_types: description: The direction in which the security group rule is applied required: false default: ingress - status: SUPPORTED + status: supported constraints: - valid_values: - egress @@ -75,7 +75,7 @@ data_types: type: integer description: The minimum port number in the range that is matched by the security group rule. required: false - status: SUPPORTED + status: supported constraints: - in_range: - 0 @@ -88,24 +88,24 @@ node_types: type: string description: Description of the security group required: false - status: SUPPORTED + status: supported name: type: string description: A symbolic name for this security group, which is not required to be unique. required: false - status: SUPPORTED + status: supported rules: type: list description: List of security group rules required: false - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule attributes: show: type: string description: Detailed information about resource - status: SUPPORTED + status: supported requirements: - port: capability: tosca.capabilities.Attachment 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 d77e378a79..906b6349e3 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 @@ -15,35 +15,35 @@ data_types: type: boolean description: Flag to enable/disable port security on the port required: false - status: SUPPORTED + status: supported mac_address: type: string description: MAC address to give to this port required: false - status: SUPPORTED + status: supported admin_state_up: type: boolean description: The administrative state of this port required: false default: true - status: SUPPORTED + status: supported qos_policy: type: string description: The name or ID of QoS policy to attach to this port required: false - status: SUPPORTED + status: supported allowed_address_pairs: type: list description: Additional MAC/IP address pairs allowed to pass through the port required: false - status: SUPPORTED + 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 + status: supported constraints: - valid_values: - macvtap @@ -55,7 +55,7 @@ data_types: required: false default: { } - status: SUPPORTED + status: supported entry_schema: type: string org.openecomp.datatypes.heat.novaServer.network.AddressInfo: @@ -66,7 +66,7 @@ data_types: type: string description: Port id required: false - status: SUPPORTED + status: supported node_types: org.openecomp.resource.vfc.nodes.heat.nova.Server: derived_from: tosca.nodes.Compute @@ -75,23 +75,23 @@ node_types: type: string description: The administrator password for the server required: false - status: SUPPORTED + status: supported availability_zone: type: string description: Availability zone to create servers in required: false - status: SUPPORTED + status: supported image: type: string description: The ID or name of the image to boot with required: false - status: SUPPORTED + status: supported image_update_policy: type: string description: Policy on how to apply an image-id update required: false default: REBUILD - status: SUPPORTED + status: supported constraints: - valid_values: - REBUILD_PRESERVE_EPHEMERAL @@ -101,7 +101,7 @@ node_types: type: map description: Arbitrary key/value metadata to store for this server required: false - status: SUPPORTED + status: supported constraints: - max_length: 255 entry_schema: @@ -113,7 +113,7 @@ node_types: description: Policy on how to apply a user_data update required: false default: REPLACE - status: SUPPORTED + status: supported constraints: - valid_values: - REPLACE @@ -123,7 +123,7 @@ node_types: description: Policy on how to apply a flavor update required: false default: RESIZE - status: SUPPORTED + status: supported constraints: - valid_values: - RESIZE @@ -133,43 +133,43 @@ node_types: description: User data script to be executed by cloud-init required: false default: '' - status: SUPPORTED + status: supported flavor: type: string description: The ID or name of the flavor to boot onto required: true - status: SUPPORTED + status: supported key_name: type: string description: Name of keypair to inject into the server required: false - status: SUPPORTED + status: supported reservation_id: type: string description: A UUID for the set of servers being requested required: false - status: SUPPORTED + status: supported security_groups: type: list description: List of security group names or IDs required: false default: [ ] - status: SUPPORTED + status: supported entry_schema: type: string config_drive: type: boolean description: enable config drive on the server required: false - status: SUPPORTED + status: supported personality: type: map description: A map of files to create/overwrite on the server upon boot required: false default: { } - status: SUPPORTED + status: supported entry_schema: type: string software_config_transport: @@ -177,7 +177,7 @@ node_types: description: How the server should receive the metadata required for software configuration required: false default: POLL_SERVER_CFN - status: SUPPORTED + status: supported constraints: - valid_values: - POLL_SERVER_CFN @@ -189,7 +189,7 @@ node_types: description: How the user_data should be formatted for the server required: false default: HEAT_CFNTOOLS - status: SUPPORTED + status: supported constraints: - valid_values: - SOFTWARE_CONFIG @@ -199,7 +199,7 @@ node_types: type: string description: Control how the disk is partitioned when the server is created required: false - status: SUPPORTED + status: supported constraints: - valid_values: - AUTO @@ -208,42 +208,42 @@ node_types: type: string description: Server name required: false - status: SUPPORTED + status: supported scheduler_hints: type: map description: Arbitrary key-value pairs specified by the client to help boot a server required: false - status: SUPPORTED + status: supported entry_schema: type: string attributes: accessIPv4: type: string description: The manually assigned alternative public IPv4 address of the server - status: SUPPORTED + status: supported addresses: type: map description: A dict of all network addresses with corresponding port_id - status: SUPPORTED + status: supported entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo accessIPv6: type: string description: The manually assigned alternative public IPv6 address of the server - status: SUPPORTED + status: supported instance_name: type: string description: AWS compatible instance name - status: SUPPORTED + status: supported name: type: string description: Name of the server - status: SUPPORTED + status: supported show: type: string description: Detailed information about resource - status: SUPPORTED + status: supported console_urls: type: string description: URLs of servers consoles - status: SUPPORTED \ No newline at end of file + status: supported \ No newline at end of file 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 c93061996b..5a4607c76d 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 @@ -26,7 +26,7 @@ node_types: description: Number of CPUs requested for a software node instance required: true default: 1 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 5.0 - equal: 5 @@ -38,7 +38,7 @@ node_types: attDef1: type: string default: hi - status: SUPPORTED + status: supported requirements: - re1: capability: tosca.cap1 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 d027a4aa5a..5115d3a921 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 @@ -26,7 +26,7 @@ node_types: description: Number of CPUs requested for a software node instance required: true default: 1 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 5.0 - equal: 5 @@ -38,7 +38,7 @@ node_types: attDef1: type: string default: hi - status: SUPPORTED + status: supported requirements: - re1: capability: tosca.cap1 diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml index 5e3c7ed2e0..f6806a315f 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterface.yaml @@ -29,7 +29,7 @@ node_types: description: Number of CPUs requested for a software node instance required: true default: 1 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 5.0 - equal: 5 @@ -41,7 +41,7 @@ node_types: attDef1: type: string default: hi - status: SUPPORTED + status: supported requirements: - re1: capability: tosca.cap1 diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml index d00248741c..1a35d3af5d 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithInterfaceAndOperation.yaml @@ -31,7 +31,7 @@ node_types: description: Number of CPUs requested for a software node instance required: true default: 1 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 5.0 - equal: 5 @@ -43,7 +43,7 @@ node_types: attDef1: type: string default: hi - status: SUPPORTED + status: supported requirements: - re1: capability: tosca.cap1 diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml index 1131b4777f..eb0796fa23 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTemplateInterface.yaml @@ -26,7 +26,7 @@ node_types: description: Number of CPUs requested for a software node instance required: true default: 1 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 5.0 - equal: 5 @@ -38,7 +38,7 @@ node_types: attDef1: type: string default: hi - status: SUPPORTED + status: supported requirements: - re1: capability: tosca.cap1 diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml index 59c00c9ec3..53235e6c44 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithNodeTypeInterface.yaml @@ -31,7 +31,7 @@ node_types: description: Number of CPUs requested for a software node instance required: true default: 1 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 5.0 - equal: 5 @@ -43,7 +43,7 @@ node_types: attDef1: type: string default: hi - status: SUPPORTED + status: supported requirements: - re1: capability: tosca.cap1 diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml index 87a8fcd6b6..4fb3396d93 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml +++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/resources/mock/model/serviceTemplateWithServiceFilter.yaml @@ -26,7 +26,7 @@ node_types: description: Number of CPUs requested for a software node instance required: true default: 1 - status: SUPPORTED + status: supported constraints: - greater_or_equal: 5.0 - equal: 5 @@ -38,7 +38,7 @@ node_types: attDef1: type: string default: hi - status: SUPPORTED + status: supported requirements: - re1: capability: tosca.cap1 -- cgit 1.2.3-korg