Commit 2892df8e authored by ramanathan's avatar ramanathan
Browse files

Merge branch 'issue#28' into 'dev-v3.5.1'

issue#28 Fixes Enum Values and description from IFA011ed341

See merge request !85
parents 9fb8a11b a3982750
Pipeline #6512 passed with stage
in 0 seconds
...@@ -482,8 +482,11 @@ submodule etsi-nfv-common { ...@@ -482,8 +482,11 @@ submodule etsi-nfv-common {
"Applicable to VirtualComputeDesc and VirtualStorageDesc. "Applicable to VirtualComputeDesc and VirtualStorageDesc.
When present, specifies the allowed migration types in the When present, specifies the allowed migration types in the
order of preference in case of an impact starting with the order of preference in case of an impact starting with the
most preferred type. Possible values: NO_MIGRATION, most preferred type.
OFFLINE_MIGRATION, LIVE_MIGRATION."; Values:
• NO_MIGRATION
• OFFLINE_MIGRATION
• LIVE_MIGRATION.";
reference reference
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo "GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element"; information element";
...@@ -565,11 +568,15 @@ submodule etsi-nfv-common { ...@@ -565,11 +568,15 @@ submodule etsi-nfv-common {
} }
min-elements 1; min-elements 1;
description description
"Identifies the protocols that the VL uses (Ethernet, "Specifies the protocols that the VL uses
MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). The top layer Values:
protocol of the VL protocol stack shall always be provided. • Ethernet
The lower layer protocols may be included when there are • MPLS
specific requirements on these layers."; • ODU2
• IPV4
• IPV6
• Pseudo-Wire
• etc.";
reference reference
"GS NFV IFA011: Section 7.1.7.3, ConnectivityType "GS NFV IFA011: Section 7.1.7.3, ConnectivityType
information element."; information element.";
...@@ -578,7 +585,7 @@ submodule etsi-nfv-common { ...@@ -578,7 +585,7 @@ submodule etsi-nfv-common {
leaf flow-pattern { leaf flow-pattern {
type flow-pattern; type flow-pattern;
description description
"Identifies the flow pattern of the connectivity (Line, "Specifies the flow pattern of the connectivity (Line,
Tree, Mesh)."; Tree, Mesh).";
reference reference
"GS NFV IFA011: Section 7.1.7.3, ConnectivityType "GS NFV IFA011: Section 7.1.7.3, ConnectivityType
...@@ -700,9 +707,15 @@ submodule etsi-nfv-common { ...@@ -700,9 +707,15 @@ submodule etsi-nfv-common {
base layer-protocol; base layer-protocol;
} }
description description
"Identifies a protocol that the connection points "Specifies which protocol the CP uses for connectivity purposes
corresponding to the CPD support for connectivity purposes Values:
(e.g. Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire, etc.)."; • Ethernet
• MPLS
• ODU2
• IPV4
• IPV6
• Pseudo-Wire
• etc.";
reference reference
"GS NFV IFA011: Section 7.1.6.3 Cpd information element"; "GS NFV IFA011: Section 7.1.6.3 Cpd information element";
} }
...@@ -740,7 +753,15 @@ submodule etsi-nfv-common { ...@@ -740,7 +753,15 @@ submodule etsi-nfv-common {
} }
description description
"One of the values of the attribute layerProtocol of the Cpd "One of the values of the attribute layerProtocol of the Cpd
IE."; IE.
Values:
• Ethernet
• MPLS
• ODU2
• IPV4
• IPV6
• Pseudo-Wire
• etc.";
reference reference
"GS NFV IFA011: Section 7.1.6.8 CpProtocolData information "GS NFV IFA011: Section 7.1.6.8 CpProtocolData information
element"; element";
...@@ -756,10 +777,10 @@ submodule etsi-nfv-common { ...@@ -756,10 +777,10 @@ submodule etsi-nfv-common {
description description
"Describes the type of the address to be assigned to the "Describes the type of the address to be assigned to the
CP instantiated from the parent CPD. CP instantiated from the parent CPD.
Value: Values:
• MAC address. • MAC address
• IP address. • IP address
Etc. etc.
The content type shall be aligned with the address type The content type shall be aligned with the address type
supported by the layerProtocol attribute of the parent supported by the layerProtocol attribute of the parent
CPD."; CPD.";
...@@ -826,9 +847,10 @@ submodule etsi-nfv-common { ...@@ -826,9 +847,10 @@ submodule etsi-nfv-common {
enum "ipv6"; enum "ipv6";
} }
description description
"Define address type. The address type should be aligned "Define address type.
with the address type supported by the layerProtocol Values:
attribute of the parent VnfExtCpd."; • IPV4
• IPV6.";
reference reference
"GS NFV IFA011: Section 7.1.3.4, L3AddressData "GS NFV IFA011: Section 7.1.3.4, L3AddressData
information element."; information element.";
...@@ -917,7 +939,10 @@ submodule etsi-nfv-common { ...@@ -917,7 +939,10 @@ submodule etsi-nfv-common {
default "ingress"; default "ingress";
description description
"The direction in which the security group rule is applied. "The direction in which the security group rule is applied.
Permitted values: INGRESS, EGRESS. Defaults to INGRESS."; Values:
• INGRESS
• EGRESS
Defaults to INGRESS.";
reference reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element."; information element.";
...@@ -931,7 +956,10 @@ submodule etsi-nfv-common { ...@@ -931,7 +956,10 @@ submodule etsi-nfv-common {
default "ipv4"; default "ipv4";
description description
"Indicates the protocol carried over the Ethernet layer. "Indicates the protocol carried over the Ethernet layer.
Permitted values: IPV4, IPV6. Defaults to IPV4."; Values:
• IPV4
• IPV6
Defaults to IPV4.";
reference reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element."; information element.";
...@@ -947,8 +975,13 @@ submodule etsi-nfv-common { ...@@ -947,8 +975,13 @@ submodule etsi-nfv-common {
description description
"Indicates the protocol carried over the IP layer. "Indicates the protocol carried over the IP layer.
Permitted values: any protocol defined in the IANA Permitted values: any protocol defined in the IANA
protocol registry, e.g. TCP, UDP, ICMP, etc. Defaults protocol registry.
to TCP."; Values:
• TCP
• UDP
• ICMP
• etc.
Defaults to TCP.";
reference reference
"GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
information element."; information element.";
......
...@@ -194,7 +194,10 @@ submodule etsi-nfv-vnf { ...@@ -194,7 +194,10 @@ submodule etsi-nfv-vnf {
type affinity-type; type affinity-type;
description description
"Specifies whether the rule is an affinity rule or an "Specifies whether the rule is an affinity rule or an
anti-affinity rule."; anti-affinity rule
Values
• affinity
• anti-affinity.";
reference reference
"GS NFV IFA011: Section 7.1.8.11, "GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element."; LocalAffinityOrAntiAffinityRule information element.";
...@@ -203,9 +206,13 @@ submodule etsi-nfv-vnf { ...@@ -203,9 +206,13 @@ submodule etsi-nfv-vnf {
leaf scope { leaf scope {
type affinity-scope; type affinity-scope;
description description
"Specifies the scope of the rule. Possible values are "Specifies the scope of the rule.
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node', and Values:
'network-link-and-node'."; • NFVI-PoP
• Zone
• ZoneGroup
• NFVI-node
• network-link-and-node.";
reference reference
"GS NFV IFA011: Section 7.1.8.11, "GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element."; LocalAffinityOrAntiAffinityRule information element.";
...@@ -436,7 +443,8 @@ submodule etsi-nfv-vnf { ...@@ -436,7 +443,8 @@ submodule etsi-nfv-vnf {
"Describes the type of the virtual network interface "Describes the type of the virtual network interface
realizing the CPs instantiated from this CPD. This is realizing the CPs instantiated from this CPD. This is
used to determine which mechanism driver(s) to be used used to determine which mechanism driver(s) to be used
to bind the port. Value: to bind the port.
Values:
• NORMAL • NORMAL
• VIRTIO • VIRTIO
• DIRECT • DIRECT
...@@ -946,7 +954,9 @@ submodule etsi-nfv-vnf { ...@@ -946,7 +954,9 @@ submodule etsi-nfv-vnf {
} }
description description
"Indicates the policy for CPU pinning. "Indicates the policy for CPU pinning.
The policy can take values of 'static' or 'dynamic'. Values:
• static
• dynamic
In case of 'static' the virtual CPU cores are In case of 'static' the virtual CPU cores are
requested to be allocated to logical CPU cores requested to be allocated to logical CPU cores
according to the rules defined in according to the rules defined in
...@@ -1027,8 +1037,11 @@ submodule etsi-nfv-vnf { ...@@ -1027,8 +1037,11 @@ submodule etsi-nfv-vnf {
} }
default "nfv:block"; default "nfv:block";
description description
"Type of virtualised storage resource (BLOCK, OBJECT, "Type of virtualised storage resource
FILE)."; Values:
• BLOCK
• OBJECT
• FILE.";
reference reference
"GS NFV IFA011: Section 7.1.9.4, Information elements "GS NFV IFA011: Section 7.1.9.4, Information elements
related to Virtual Storage."; related to Virtual Storage.";
...@@ -1627,7 +1640,10 @@ submodule etsi-nfv-vnf { ...@@ -1627,7 +1640,10 @@ submodule etsi-nfv-vnf {
} }
description description
"It indicates the function the virtual IP address is used "It indicates the function the virtual IP address is used
for. Permitted values: high availability, load balancing."; for.
Values:
• high availability
• load balancing.";
reference reference
"GS NFV IFA011: Section 7.1.17.2, VipCpd information element."; "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
} }
...@@ -1848,7 +1864,13 @@ submodule etsi-nfv-vnf { ...@@ -1848,7 +1864,13 @@ submodule etsi-nfv-vnf {
} }
description description
"One of the values of the attribute layerProtocol of "One of the values of the attribute layerProtocol of
the ConnectivityType IE."; the ConnectivityType IE
Values:
• Ethernet
• MPLS
• ODU2
• Pseudo-Wire
• etc.";
reference reference
"GS NFV IFA011: Section 7.1.8.13, "GS NFV IFA011: Section 7.1.8.13,
VirtualLinkProtocolData information element."; VirtualLinkProtocolData information element.";
...@@ -1878,7 +1900,11 @@ submodule etsi-nfv-vnf { ...@@ -1878,7 +1900,11 @@ submodule etsi-nfv-vnf {
} }
description description
"Specifies the network type for this L2 protocol. "Specifies the network type for this L2 protocol.
Possible values: FLAT, VLAN, VXLAN, GRE."; Values:
• FLAT
• VLAN
• VXLAN
• GRE.";
reference reference
"GS NFV IFA011: Section 7.1.8.14, "GS NFV IFA011: Section 7.1.8.14,
L2ProtocolData information element."; L2ProtocolData information element.";
...@@ -1947,8 +1973,8 @@ submodule etsi-nfv-vnf { ...@@ -1947,8 +1973,8 @@ submodule etsi-nfv-vnf {
default "ipv4"; default "ipv4";
description description
"Specifies IP version of this L3 protocol. "Specifies IP version of this L3 protocol.
Value: Values:
• IPV4. • IPV4
• IPV6."; • IPV6.";
reference reference
"GS NFV IFA011: Section 7.1.8.15, "GS NFV IFA011: Section 7.1.8.15,
...@@ -2005,10 +2031,11 @@ submodule etsi-nfv-vnf { ...@@ -2005,10 +2031,11 @@ submodule etsi-nfv-vnf {
enum dhcpv6-stateless; enum dhcpv6-stateless;
} }
description description
"Specifies IPv6 address mode. Possible values: "Specifies IPv6 address mode.
• SLAAC. Values:
• DHCPV6-STATEFUL. • SLAAC
• DHCPV6-STATELESS. • DHCPV6-STATEFUL
• DHCPV6-STATELESS
May be present when the value of the ipVersion May be present when the value of the ipVersion
attribute is 'IPV6' and shall be absent otherwise."; attribute is 'IPV6' and shall be absent otherwise.";
reference reference
...@@ -2166,7 +2193,13 @@ submodule etsi-nfv-vnf { ...@@ -2166,7 +2193,13 @@ submodule etsi-nfv-vnf {
"Indicates which operations are available for this DF via "Indicates which operations are available for this DF via
the VNF LCM interface. Instantiate VNF, Query VNF and the VNF LCM interface. Instantiate VNF, Query VNF and
Terminate VNF are supported in all DF and therefore Terminate VNF are supported in all DF and therefore
need not be included in this list."; need not be included in this list.
Values:
• Scale VNF
• Scale VNF to level
• Heal VNF
• Operate VNF
• etc.";
reference reference
"GS NFV IFA011: Section 7.1.8.2 VnfDf information "GS NFV IFA011: Section 7.1.8.2 VnfDf information
element"; element";
...@@ -2672,11 +2705,11 @@ submodule etsi-nfv-vnf { ...@@ -2672,11 +2705,11 @@ submodule etsi-nfv-vnf {
enum both; enum both;
} }
description description
"Describe the source of the indicator. The possible "Describe the source of the indicator.
values are: Values:
• VNF. • VNF
• EM. • EM
• Both. • Both
This tells the consumer where to send the subscription This tells the consumer where to send the subscription
request."; request.";
...@@ -2703,11 +2736,11 @@ submodule etsi-nfv-vnf { ...@@ -2703,11 +2736,11 @@ submodule etsi-nfv-vnf {
enum vnf-lcm-coordination; enum vnf-lcm-coordination;
} }
description description
"Identifies an interface produced by the VNF. Valid "Identifies an interface produced by the VNF.
values: Values:
- VNF_CONFIGURATION VNF_CONFIGURATION
- VNF_INDICATOR VNF_INDICATOR
- VNF_LCM_COORDINATION"; VNF_LCM_COORDINATION";
reference reference
"GS NFV IFA011: Section 7.1.8.16 VnfInterfaceDetails "GS NFV IFA011: Section 7.1.8.16 VnfInterfaceDetails
information element"; information element";
...@@ -3504,12 +3537,12 @@ submodule etsi-nfv-vnf { ...@@ -3504,12 +3537,12 @@ submodule etsi-nfv-vnf {
description description
"When present, it specifies the type of modification "When present, it specifies the type of modification
resulting from transitioning from srcVnfdId to dstVnfdId. resulting from transitioning from srcVnfdId to dstVnfdId.
The possible values include at least: Values:
UP - indicating that the destination VNF version is newer • UP:indicating that the destination VNF version is newer
than the source version, than the source version,
DOWN - indicating that the destination VNF version is DOWN:indicating that the destination VNF version is
older than the source version. older than the source version.
When provided, UP and DOWN values shall always be When provided, UP and DOWN values shall always be
supported as the first value. In addition, a vendor may supported as the first value. In addition, a vendor may
...@@ -3663,9 +3696,9 @@ submodule etsi-nfv-vnf { ...@@ -3663,9 +3696,9 @@ submodule etsi-nfv-vnf {
"Specifies the type of the endpoint exposing the LCM "Specifies the type of the endpoint exposing the LCM
operation coordination such as other operations supporting operation coordination such as other operations supporting
or management systems (e.g. an EM) or the VNF instance. or management systems (e.g. an EM) or the VNF instance.
Allowed values: Values:
• MGMT: coordination with other operation supporting • MGMT: coordination with other operation supporting
management systems. management systems
• VNF: coordination with the VNF instance."; • VNF: coordination with the VNF instance.";
reference reference
"GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment