Commit a1e42db5 authored by Laurent Vreck's avatar Laurent Vreck
Browse files

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

Dev v3.5.1

See merge request nfv/SOL006!101
parents 48fd1d37 8fc71484
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ docker run "$IMG"
echo "Building HTML tree"
echo "Building HTML tree"
docker run -v"$(pwd)/src/yang/:/yang/" mjethanandani/pyang \
docker run -v"$(pwd)/src/yang/:/yang/" mjethanandani/pyang \
	"/bin/sh" -c "cd /yang/ && pyang -f jstree -p /yang/ \
	"/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|<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
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
+2 −2
Original line number Original line Diff line number Diff line
@@ -240,7 +240,7 @@
      </lcm-operations-configuration>
      </lcm-operations-configuration>
      <affinity-or-anti-affinity-group>
      <affinity-or-anti-affinity-group>
        <id>control-plane</id>
        <id>control-plane</id>
        <type>anti-affinity</type>
        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
        <scope>nfvi-node</scope>
        <scope>nfvi-node</scope>
      </affinity-or-anti-affinity-group>
      </affinity-or-anti-affinity-group>
    </df>
    </df>
@@ -328,7 +328,7 @@
      </lcm-operations-configuration>
      </lcm-operations-configuration>
      <affinity-or-anti-affinity-group>
      <affinity-or-anti-affinity-group>
        <id>control-plane</id>
        <id>control-plane</id>
        <type>anti-affinity</type>
        <affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
        <scope>nfvi-node</scope>
        <scope>nfvi-node</scope>
      </affinity-or-anti-affinity-group>
      </affinity-or-anti-affinity-group>
    </df>
    </df>
+9 −9
Original line number Original line Diff line number Diff line
@@ -343,10 +343,10 @@
    </sapd>
    </sapd>
    <sapd>
    <sapd>
      <id>outside</id>
      <id>outside</id>
      <vnf>
      <associated-cpd>
        <vnfd-id>CSR</vnfd-id>
        <vnfd-id>CSR</vnfd-id>
        <ext-cpd-id>left</ext-cpd-id>
        <vnf-ext-cpd>left</vnf-ext-cpd>
      </vnf>
      </associated-cpd>
    </sapd>
    </sapd>
    <virtual-link-desc>
    <virtual-link-desc>
      <id>fw2dpi</id>
      <id>fw2dpi</id>
@@ -585,17 +585,17 @@
    <vnfd-id>CSR</vnfd-id>
    <vnfd-id>CSR</vnfd-id>
    <sapd>
    <sapd>
      <id>inside</id>
      <id>inside</id>
      <ns>
      <associated-cpd>
        <nsd-id>firewall-nsd</nsd-id>
        <nsd-id>firewall-nsd</nsd-id>
        <ext-cpd-id>inside</ext-cpd-id>
        <sapd>inside</sapd>
      </ns>
      </associated-cpd>
    </sapd>
    </sapd>
    <sapd>
    <sapd>
      <id>outside</id>
      <id>outside</id>
      <vnf>
      <associated-cpd>
        <vnfd-id>CSR</vnfd-id>
        <vnfd-id>CSR</vnfd-id>
        <ext-cpd-id>left</ext-cpd-id>
        <vnf-ext-cpd>left</vnf-ext-cpd>
      </vnf>
      </associated-cpd>
    </sapd>
    </sapd>
    <virtual-link-desc>
    <virtual-link-desc>
      <id>r2fw</id>
      <id>r2fw</id>
+66 −23
Original line number Original line Diff line number Diff line
@@ -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 {
        }
        }
	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 {
      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 {
        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 {
        }
        }
        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 {
          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 {
              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.";
@@ -843,6 +865,16 @@ submodule etsi-nfv-common {
              "GS NFV IFA011: Section 7.1.3.4, L3AddressData
              "GS NFV IFA011: Section 7.1.3.4, L3AddressData
               information element.";
               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
        description
          "Provides information on the addresses to be assigned to the
          "Provides information on the addresses to be assigned to the
@@ -907,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.";
@@ -921,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.";
@@ -937,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.";
+286 −79

File changed.

Preview size limit exceeded, changes collapsed.

Loading