Merge branch 'dev-v3.5.1' into 'master'

Dev v3.5.1

See merge request !101

.jenkins.sh

@@ -19,7 +19,7 @@ docker run "$IMG"
 echo "Building HTML tree"
 docker run -v"$(pwd)/src/yang/:/yang/" mjethanandani/pyang \
 	"/bin/sh" -c "cd /yang/ && pyang -f jstree -p /yang/ \
-	/yang/etsi-nfv.yang > etsi-nfv.html"
+	/yang/etsi-nfv-descriptors.yang > etsi-nfv.html"
 
 sed -r -i 's|<a href=\"http://www.tail-f.com">|<a href="http://etsi.org">|g' src/yang/etsi-nfv.html
 sed -r -i 's|data\:image/gif\;base64,R0lGODlhS.*RCAA7|https://www.etsi.org/images/ETSILogoTwitter.png\" height=\"100|g' src/yang/etsi-nfv.html

example-data/complex-vnfd.xml

@@ -240,7 +240,7 @@
       </lcm-operations-configuration>
       <affinity-or-anti-affinity-group>
         <id>control-plane</id>
-        <type>anti-affinity</type>
+        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
         <scope>nfvi-node</scope>
       </affinity-or-anti-affinity-group>
     </df>
@@ -328,7 +328,7 @@
       </lcm-operations-configuration>
       <affinity-or-anti-affinity-group>
         <id>control-plane</id>
-        <type>anti-affinity</type>
+        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
         <scope>nfvi-node</scope>
       </affinity-or-anti-affinity-group>
     </df>

example-data/nfv.xml

@@ -343,10 +343,10 @@
     </sapd>
     <sapd>
       <id>outside</id>
-      <vnf>
+      <associated-cpd>
         <vnfd-id>CSR</vnfd-id>
-        <ext-cpd-id>left</ext-cpd-id>
-      </vnf>
+        <vnf-ext-cpd>left</vnf-ext-cpd>
+      </associated-cpd>
     </sapd>
     <virtual-link-desc>
       <id>fw2dpi</id>
@@ -585,17 +585,17 @@
     <vnfd-id>CSR</vnfd-id>
     <sapd>
       <id>inside</id>
-      <ns>
+      <associated-cpd>
         <nsd-id>firewall-nsd</nsd-id>
-        <ext-cpd-id>inside</ext-cpd-id>
-      </ns>
+        <sapd>inside</sapd>
+      </associated-cpd>
     </sapd>
     <sapd>
       <id>outside</id>
-      <vnf>
+      <associated-cpd>
         <vnfd-id>CSR</vnfd-id>
-        <ext-cpd-id>left</ext-cpd-id>
-      </vnf>
+        <vnf-ext-cpd>left</vnf-ext-cpd>
+      </associated-cpd>
     </sapd>
     <virtual-link-desc>
       <id>r2fw</id>

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.";
@@ -843,6 +865,16 @@ submodule etsi-nfv-common {
               "GS NFV IFA011: Section 7.1.3.4, L3AddressData
                information element.";
           }
+
+          leaf fixed-ip-address {
+            type string;
+            description
+              "IP address to be assigned to the CP instance.";
+            reference
+              "GS NFV IFA011: Section 7.1.3.4, L3AddressData
+               information element.";
+          }
+
         }
         description
           "Provides information on the addresses to be assigned to the
@@ -907,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.";
@@ -921,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.";
@@ -937,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.";