updated jsons, schemas and importing of variables for descriptors

SOL003/VNFLifecycleOperationGranting-API/Grants.robot

@@ -6,8 +6,8 @@ Library    OperatingSystem
 Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    Collections
-Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
-Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
+#Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+#Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 Documentation    This resource represents grants. The client can use this resource to obtain permission
 ...     from the NFVO to perform a particular VNF lifecycle operation.
 
@@ -215,6 +215,7 @@ PARSE the Descriptor File
     Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
 Fetch Information from SOL001 descriptor file
+    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
     ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.properties.descriptor_id}
     ${provider}=    Get Variable Value    ${topology_template.node_templates.properties.provider}
     ${product_name}=    Get Variable Value    ${topology_template.node_templates.properties.product_name}
@@ -229,6 +230,7 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    ${Flavour_ID}    ${flavour_id}
     
 Fetch Information from SOL006 descriptor file
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     ${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']}
@@ -238,6 +240,4 @@ Fetch Information from SOL006 descriptor file
     Set Global Variable    ${Provider}    ${provider}
     Set Global Variable    ${Product_Name}    ${product_name}
     Set Global Variable    ${Software_Version}    ${software_version}
-    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
-
-    
+    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
\ No newline at end of file

SOL003/VNFLifecycleOperationGranting-API/IndividualGrant.robot

@@ -5,8 +5,8 @@ Library    JSONLibrary
 Library    JSONSchemaLibrary    schemas/
 Library    Collections
 Library    REST    ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT}    ssl_verify=false
-Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
-Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
+#Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+#Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 Documentation    This resource represents an individual grant. The client can use this resource to read the grant.
 ...    It is determined by means outside the scope of the present document, such as configuration or policy,
 ...    how long an individual grant is available.
@@ -176,6 +176,7 @@ PARSE the Descriptor File
     Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
     
 Fetch Information from SOL001 descriptor file
+    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
     @{VDU_labels}=    Create List
     @{VirtualLink_labels}=    Create List
     @{CP_labels}=    Create List
@@ -193,6 +194,7 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    @{CP_IDs}    @{CP_labels}
     
 Fetch Information from SOL006 descriptor file
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     ${VDUcount}=    Get Length    ${nfv.vnfd[0].vdu}
     ${extCP_count}=    Get Length    ${nfv.vnfd[0]['ext-cpd']}
     ${virtualLink_count}=    Get length    ${nfv.vnfd[0]['int-virtual-link-desc']}
@@ -206,7 +208,8 @@ Fetch Information from SOL006 descriptor file
     END
         
 Get VDU IDs
-    [Arguments]    ${count}    
+    [Arguments]    ${count} 
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml   
     @{VDU_labels}=    Create List
     @{Compute_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
@@ -218,6 +221,7 @@ Get VDU IDs
                 
 Get External CP IDs
     [Arguments]    ${count}    
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     @{external_CPs}=    Create List
     FOR    ${i}    IN RANGE    ${count}
         Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
@@ -225,7 +229,8 @@ Get External CP IDs
     Set Global Variable    ${externalCP_IDs}    ${external_CPs}
 
 Get Virtual Link IDs
-    [Arguments]    ${count}    
+    [Arguments]    ${count}  
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml  
     ${VirtualLink_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
         Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']} 

SOL003/VNFLifecycleOperationGranting-API/jsons/grantRejectedRequest.json

@@ -5,6 +5,7 @@
   "flavourId": "{flavourId}",
   "operation": "INSTANTIATE",
   "isAutomaticInvocation": true,
+  "instantiationLevelId": "",
   "_links": {{
     "vnfLcmOpOcc": {{
       "href": "string"

SOL003/VNFLifecycleOperationGranting-API/jsons/grantRequest.json

@@ -5,6 +5,7 @@
   "flavourId": "{flavourId}",
   "operation": "INSTANTIATE",
   "isAutomaticInvocation": true,
+  "instantiationLevelId": "",
   "_links": {{
     "vnfLcmOpOcc": {{
       "href": "string"