Commit 39ab0454 authored by Bertrand Souville's avatar Bertrand Souville
Browse files

Merge branch 'SOL002_V521_FEAT21_Security_Groups' into '5.2.2' 

SOL002_V521_CR170_FEAT21_Security_Groups

See merge request !32
parents ee992137 3d6e8f67

src/SOL002/General_Definitions/SOL002_def.yaml

+14 −1
Original line number Diff line number Diff line
@@ -784,6 +784,8 @@ definitions: 
                to the same namespace as defined by the corresponding "containerNamespace" attribute in the "resourceHandle" attribute

                in the "NetAttDefResourceData".

      * NOTE 4: Either linkPortId or netAttDefResourceId may be included, but not both.

      * Editor's Note: Specification of CpSecurityGroupData data type is FFS

                       due to dependency on SOL001/descriptor work.

    anyOf:

      - required:

        - linkPortId
@@ -825,7 +827,18 @@ definitions: 
        type: array

        items:

          $ref: "#/definitions/CpProtocolData"



      cpSecurityGroupData:

        description: >

          Parameters for modifying and overriding security groups

          information bound to this CP. The parameters identify

          which "SecurityGroupRule" specified in the VNFD is

          activated/deactivated and for an activated security group

          rule the values of attributes defined in the VNFD that can

          be overridden such as "portRangeMin" and "portRangeMax".

          If no security group configuration is provided for a given

          "SecurityGroupRule" specified in the VNFD as part of this

          attribute, the VNFM shall use the configuration as specified

          in the VNFD.

      netAttDefResourceId:

        description: >

          Identifier of the “NetAttDefResourceData” structure that

src/SOL002/VNFLifecycleManagement/definitions/SOL002VNFLifecycleManagement_def.yaml

+14 −8
Original line number Diff line number Diff line
@@ -3014,14 +3014,16 @@ definitions: 
    description: >

      This type represents information about an external CP of a VNF.



      NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and 

      * NOTE 1:	The attributes "associatedVnfcCpId", "associatedVipCpId", "associatedVirtualCpId" and 

                "associatedVnfVirtualLinkId" are mutually exclusive. Exactly one shall be present.

      NOTE 2:	An external CP instance is not associated to a link port in the cases indicated for the 

      * NOTE 2:	An external CP instance is not associated to a link port in the cases indicated for the 

                “extLinkPorts” attribute in clause 4.4.1.11.

      NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network 

      * NOTE 3: Cardinality greater than 1 is only applicable for specific cases where more than one network 

                attachment definition resource is needed to fulfil the connectivity requirements of the external 

                CP, e.g. to build a link redundant mated pair in SR-IOV cases.

      NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.

      * NOTE 4: When more than one netAttDefResourceId is indicated, all shall belong to the same namespace.

      * Editor's Note: Specification of CpSecurityGroupInfo data type is FFS due to dependency on SOL001/

                       descriptor work.

    type: object

    required:

      - id
@@ -3110,6 +3112,10 @@ definitions: 
          This attribute shall be supported when delegation mode in certificate management is applicable.

        type: array

        $ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"

      cpSecurityGroupInfo:

        description: >

          List of active security group rules applied to this external CP instance. The attribute identifies which

          "SecurityGroupRule" specified in the VNFD are activated and the values of its attributes.



  CertificateInfo:

    description: >