Commit d76bd1e0 authored by uihassan's avatar uihassan
Browse files

descriptors for SOL006 added

parent 9b34a0cf

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

+13 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Library BuiltIn 
Library    JSONLibrary

Library    Collections

Library    JSONSchemaLibrary    schemas/

Variables    descriptors/vnf-b-1_VNF.yaml

Variables    descriptors/SOL001/vnf-b-1_VNF.yaml



*** Keywords ***

Get Vnf Instance
@@ -1219,7 +1219,18 @@ Parse SOL001 
    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${flavour_id}

    

Parse SOL006

    Log    SOL006 code

    #Log    SOL006 code

     ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}

     ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}

     ${product_name}=    Get Variable Value    ${nfv.vnfd[0].product-name}

     ${software_version}=    Get Variable Value    ${nfv.vnfd[0].software-version}

     ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}

     

    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${descriptor_id}

    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${provider}

    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${product_name}

    Should Be Equal As Strings    ${response['body']['vnfSoftwareVesion']}    ${software_version}

    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${descriptor_version}

    

Get key for VNF Descriptor

    FOR    ${key}    IN    @{topology_template.node_templates.keys()}

SOL003/VNFLifecycleManagement-API/descriptors/SOL006/reference_tst010_vnf_b_2df_SOL006.yaml

0 → 100644
+105 −0
Original line number Diff line number Diff line 
nfv:

  vnfd:

    - id: VNF-B-2df

      provider: ETSI TST WG

      product-name: TST010 reference VNF-B with 2 DFs

      software-version: '2.1'

      version: '2.1'

      vnfm-info: ETSI VNFM

      vdu:

        id: vdu-b-1

        name: VNF-B VDU 1

        int-cpd:

          - id: left

            layer-protocol: ethernet

          - id: management

            layer-protocol: ethernet

          - id: right

            layer-protocol: ethernet

        virtual-compute-desc: vdu-b-1-vcd

        virtual-storage-desc: vdu-b-1-vsd

        sw-image-desc: vdu-b-1-image

      virtual-compute-desc:

        id: vdu-b-1-vcd

        virtual-memory:

          size: '4.0'

        virtual-cpu:

          num-virtual-cpu: '2'

      virtual-storage-desc:

        id: vdu-b-1-vsd

        type-of-storage: root-storage

        size-of-storage: '0'

      sw-image-desc:

        id: vdu-b-1-image

        name: VNF-B image

        version: '1.1'

        checksum:

          algorithm: sha-224

          hash: somehashfortst010

        container-format: bare

        disk-format: qcow2

        min-disk: '1'

        min-ram: '2.0'

        size: '1'

        image: 'http://someurl.com/VNF-B.qcow2'

      ext-cpd:

        - id: ext-b-left

          int-cpd:

            vdu-id: vdu-b-1

            cpd: left

          layer-protocol: ethernet

        - id: management

          int-cpd:

            vdu-id: vdu-b-1

            cpd: management

          layer-protocol: ethernet

        - id: ext-b-right

          int-cpd:

            vdu-id: vdu-b-1

            cpd: right

          layer-protocol: ethernet

      df:

        - id: small

          vdu-profile:

            id: vdu-b-1

            min-number-of-instances: '1'

            max-number-of-instances: '2'

          instantiation-level:

            - id: double

              vdu-level:

                vdu-id: vdu-b-1

                number-of-instances: '2'

            - id: single

              vdu-level:

                vdu-id: vdu-b-1

                number-of-instances: '1'

          default-instantiation-level: single

          lcm-operations-configuration:

            scale-vnf-to-level-op-config:

              arbitrary-target-levels-supported: 'true'

            terminate-vnf-op-config:

              min-graceful-termination: '1'

            operate-vnf-op-config:

              min-graceful-stop-timeout: '1'

        - id: big

          vdu-profile:

            id: vdu-b-1

            min-number-of-instances: '1'

            max-number-of-instances: '4'

          instantiation-level:

            - id: double

              vdu-level:

                vdu-id: vdu-b-1

                number-of-instances: '2'

            - id: triple

              vdu-level:

                vdu-id: vdu-b-1

                number-of-instances: '3'

          default-instantiation-level: double

          lcm-operations-configuration:

            scale-vnf-to-level-op-config:

              arbitrary-target-levels-supported: 'true'

            terminate-vnf-op-config:

              min-graceful-termination: '1'

            operate-vnf-op-config:

              min-graceful-stop-timeout: '1'
 
 No newline at end of file

SOL003/VNFLifecycleManagement-API/validate.sh

0 → 100644
+8 −0
Original line number Diff line number Diff line 
str=Keywords.robot;

for i in *.robot ; do

	[[ "$i" != *"$str"* ]] && \

	echo "++++ Dryrun $i" && \

	robot --dryrun --output NONE --report NONE --log NONE $i || \

	echo "++++ Issues in file $i";

done

read  -n 1 -p "Input Selection:" mainmenuinput
 
 No newline at end of file