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

issue#28 Fixes Enum Values and description from IFA011ed341

See merge request !85

src/yang/etsi-nfv-common.yang

@@ -482,8 +482,11 @@ submodule etsi-nfv-common {
           "Applicable to VirtualComputeDesc and VirtualStorageDesc.
            When present, specifies the allowed migration types in the
            order of preference in case of an impact starting with the
-           most preferred type. Possible values: NO_MIGRATION,
-           OFFLINE_MIGRATION, LIVE_MIGRATION.";
+           most preferred type.
+           Values:
+             • NO_MIGRATION
+             • OFFLINE_MIGRATION
+             • LIVE_MIGRATION.";
         reference
           "GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
            information element";
@@ -565,11 +568,15 @@ submodule etsi-nfv-common {
         }
 	min-elements 1;
         description
-          "Identifies the protocols that the VL uses (Ethernet,
-           MPLS, ODU2, IPV4, IPV6, Pseudo-Wire). The top layer
-           protocol of the VL protocol stack shall always be provided.
-           The lower layer protocols may be included when there are
-           specific requirements on these layers.";
+          "Specifies the protocols that the VL uses
+           Values:
+             • Ethernet
+             • MPLS
+             • ODU2
+             • IPV4
+             • IPV6
+             • Pseudo-Wire
+             • etc.";
         reference
           "GS NFV IFA011: Section 7.1.7.3, ConnectivityType
            information element.";
@@ -578,7 +585,7 @@ submodule etsi-nfv-common {
       leaf flow-pattern {
         type flow-pattern;
         description
-          "Identifies the flow pattern of the connectivity (Line,
+          "Specifies the flow pattern of the connectivity (Line,
            Tree, Mesh).";
         reference
           "GS NFV IFA011: Section 7.1.7.3, ConnectivityType
@@ -700,9 +707,15 @@ submodule etsi-nfv-common {
         base layer-protocol;
       }
       description
-        "Identifies a protocol that the connection points
-         corresponding to the CPD support for connectivity purposes
-         (e.g. Ethernet, MPLS, ODU2, IPV4, IPV6, Pseudo-Wire, etc.).";
+        "Specifies which protocol the CP uses for connectivity purposes
+         Values:
+           • Ethernet
+           • MPLS
+           • ODU2
+           • IPV4
+           • IPV6
+           • Pseudo-Wire
+           • etc.";
       reference
         "GS NFV IFA011: Section 7.1.6.3 Cpd information element";
     }
@@ -740,7 +753,15 @@ submodule etsi-nfv-common {
         }
         description
           "One of the values of the attribute layerProtocol of the Cpd
-           IE.";
+           IE.
+           Values:
+           • Ethernet
+           • MPLS
+           • ODU2
+           • IPV4
+           • IPV6
+           • Pseudo-Wire
+           • etc.";
         reference
           "GS NFV IFA011: Section 7.1.6.8 CpProtocolData information
            element";
@@ -756,10 +777,10 @@ submodule etsi-nfv-common {
           description
             "Describes the type of the address to be assigned to the
              CP instantiated from the parent CPD.
-             Value:
-               • MAC address.
-               • IP address.
-               • Etc.
+             Values:
+               • MAC address
+               • IP address
+               • etc.
              The content type shall be aligned with the address type
              supported by the layerProtocol attribute of the parent
              CPD.";
@@ -826,9 +847,10 @@ submodule etsi-nfv-common {
               enum "ipv6";
             }
             description
-              "Define address type. The address type should be aligned
-               with the address type supported by the layerProtocol
-               attribute of the parent VnfExtCpd.";
+              "Define address type.
+               Values:
+                 • IPV4
+                 • IPV6.";
             reference
               "GS NFV IFA011: Section 7.1.3.4, L3AddressData
                information element.";
@@ -917,7 +939,10 @@ submodule etsi-nfv-common {
         default "ingress";
         description
           "The direction in which the security group rule is applied.
-           Permitted values: INGRESS, EGRESS. Defaults to INGRESS.";
+           Values:
+             • INGRESS
+             • EGRESS
+           Defaults to INGRESS.";
         reference
           "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
            information element.";
@@ -931,7 +956,10 @@ submodule etsi-nfv-common {
         default "ipv4";
         description
           "Indicates the protocol carried over the Ethernet layer.
-           Permitted values: IPV4, IPV6. Defaults to IPV4.";
+           Values:
+             • IPV4
+             • IPV6
+           Defaults to IPV4.";
         reference
           "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
            information element.";
@@ -947,8 +975,13 @@ submodule etsi-nfv-common {
         description
           "Indicates the protocol carried over the IP layer.
            Permitted values: any protocol defined in the IANA
-           protocol registry, e.g. TCP, UDP, ICMP, etc. Defaults
-           to TCP.";
+           protocol registry.
+           Values:
+             • TCP
+             • UDP
+             • ICMP
+             • etc.
+           Defaults to TCP.";
         reference
           "GS NFV IFA011: Section 7.1.6.9, SecurityGroupRule
            information element.";

src/yang/etsi-nfv-vnf.yang

@@ -194,7 +194,10 @@ submodule etsi-nfv-vnf {
         type affinity-type;
         description
           "Specifies whether the rule is an affinity rule or an
-           anti-affinity rule.";
+           anti-affinity rule
+           Values
+             • affinity
+             • anti-affinity.";
         reference
           "GS NFV IFA011: Section 7.1.8.11,
            LocalAffinityOrAntiAffinityRule information element.";
@@ -203,9 +206,13 @@ submodule etsi-nfv-vnf {
       leaf scope {
         type affinity-scope;
         description
-          "Specifies the scope of the rule. Possible values are
-           'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node', and
-           'network-link-and-node'.";
+          "Specifies the scope of the rule.
+           Values:
+             • NFVI-PoP
+             • Zone
+             • ZoneGroup
+             • NFVI-node
+             • network-link-and-node.";
         reference
           "GS NFV IFA011: Section 7.1.8.11,
            LocalAffinityOrAntiAffinityRule information element.";
@@ -436,7 +443,8 @@ submodule etsi-nfv-vnf {
             "Describes the type of the virtual network interface
              realizing the CPs instantiated from this CPD. This is
              used to determine which mechanism driver(s) to be used
-             to bind the port. Value:
+             to bind the port.
+             Values:
              • NORMAL
              • VIRTIO
              • DIRECT
@@ -946,7 +954,9 @@ submodule etsi-nfv-vnf {
             }
             description
               "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
                requested to be allocated to logical CPU cores
                according to the rules defined in
@@ -1027,8 +1037,11 @@ submodule etsi-nfv-vnf {
         }
         default "nfv:block";
         description
-          "Type of virtualised storage resource (BLOCK, OBJECT,
-           FILE).";
+          "Type of virtualised storage resource
+           Values:
+             • BLOCK
+             • OBJECT
+             • FILE.";
         reference
           "GS NFV IFA011: Section 7.1.9.4, Information elements
            related to Virtual Storage.";
@@ -1627,7 +1640,10 @@ submodule etsi-nfv-vnf {
         }
         description
           "It indicates the function the virtual IP address is used
-           for. Permitted values: high availability, load balancing.";
+           for.
+           Values:
+             • high availability
+             • load balancing.";
         reference
           "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
       }
@@ -1848,7 +1864,13 @@ submodule etsi-nfv-vnf {
             }
             description
               "One of the values of the attribute layerProtocol of
-               the ConnectivityType IE.";
+               the ConnectivityType IE
+               Values:
+                 • Ethernet
+                 • MPLS
+                 • ODU2
+                 • Pseudo-Wire
+                 • etc.";
             reference
               "GS NFV IFA011: Section 7.1.8.13,
                VirtualLinkProtocolData information element.";
@@ -1878,7 +1900,11 @@ submodule etsi-nfv-vnf {
               }
               description
                 "Specifies the network type for this L2 protocol.
-                 Possible values: FLAT, VLAN, VXLAN, GRE.";
+                 Values:
+                   • FLAT
+                   • VLAN
+                   • VXLAN
+                   • GRE.";
               reference
                 "GS NFV IFA011: Section 7.1.8.14,
                  L2ProtocolData information element.";
@@ -1947,8 +1973,8 @@ submodule etsi-nfv-vnf {
               default "ipv4";
               description
                 "Specifies IP version of this L3 protocol.
-                 Value:
-                 • IPV4.
+                 Values:
+                 • IPV4
                  • IPV6.";
               reference
                 "GS NFV IFA011: Section 7.1.8.15,
@@ -2005,10 +2031,11 @@ submodule etsi-nfv-vnf {
                 enum dhcpv6-stateless;
               }
               description
-                "Specifies IPv6 address mode. Possible values:
-                 • SLAAC.
-                 • DHCPV6-STATEFUL.
-                 • DHCPV6-STATELESS.
+                "Specifies IPv6 address mode.
+                 Values:
+                   • SLAAC
+                   • DHCPV6-STATEFUL
+                   • DHCPV6-STATELESS
                  May be present when the value of the ipVersion
                  attribute is 'IPV6' and shall be absent otherwise.";
               reference
@@ -2166,7 +2193,13 @@ submodule etsi-nfv-vnf {
           "Indicates which operations are available for this DF via
            the VNF LCM interface. Instantiate VNF, Query VNF and
            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
           "GS NFV IFA011: Section 7.1.8.2 VnfDf information
            element";
@@ -2672,11 +2705,11 @@ submodule etsi-nfv-vnf {
             enum both;
           }
           description
-            "Describe the source of the indicator. The possible
-             values are:
-             • VNF.
-             • EM.
-             • Both.
+            "Describe the source of the indicator.
+             Values:
+              • VNF
+              • EM
+              • Both
 
              This tells the consumer where to send the subscription
              request.";
@@ -2703,11 +2736,11 @@ submodule etsi-nfv-vnf {
             enum vnf-lcm-coordination;
           }
           description
-            "Identifies an interface produced by the VNF. Valid
-             values:
-             - VNF_CONFIGURATION
-             - VNF_INDICATOR
-             - VNF_LCM_COORDINATION";
+            "Identifies an interface produced by the VNF.
+             Values:
+               • VNF_CONFIGURATION
+               • VNF_INDICATOR
+               • VNF_LCM_COORDINATION";
           reference
             "GS NFV IFA011: Section 7.1.8.16 VnfInterfaceDetails
              information element";
@@ -3504,11 +3537,11 @@ submodule etsi-nfv-vnf {
         description
           "When present, it specifies the type of modification
            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,
-           DOWN - indicating that the destination VNF version is
+           • DOWN:indicating that the destination VNF version is
                     older than the source version.
 
            When provided, UP and DOWN values shall always be
@@ -3663,9 +3696,9 @@ submodule etsi-nfv-vnf {
           "Specifies the type of the endpoint exposing the LCM
            operation coordination such as other operations supporting
            or management systems (e.g. an EM) or the VNF instance.
-           Allowed values:
+           Values:
            • MGMT: coordination with other operation supporting
-                   management systems.
+                   management systems
            • VNF: coordination with the VNF instance.";
         reference
           "GS NFV IFA011: Section 7.1.16.2 VnfLcmOperationCoordination