Commit f5ddbe8a authored by Ikram Haq's avatar Ikram Haq
Browse files

Merge branch 'TTF_T043_T4_xFlow' into 'TTF_T043'

TTF_T043_T4_xFlow Branch Merge Request into TTF_T043

See merge request !4
parents f6b05bf6 77337fee
Loading
Loading
Loading
Loading
Loading
+20 −20
Original line number Original line Diff line number Diff line
@@ -16,10 +16,10 @@ Test Teardown Test TearDown ${GRANT_ID_PLACEHOLDER} grantRequest ${
TC_MEC_MEC010p2_MEO_GRANT_001_OK
TC_MEC_MEC010p2_MEO_GRANT_001_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_OK
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Create a GRANT request    grantRequest
    Create a GRANT request    grantRequest
    Check HTTP Response Status Code Is    201
    Check HTTP Response Status Code Is    201
@@ -29,8 +29,8 @@ TC_MEC_MEC010p2_MEO_GRANT_001_OK
TC_MEC_MEC010p2_MEO_GRANT_001_BR
TC_MEC_MEC010p2_MEO_GRANT_001_BR
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_BR
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_001_BR
    ...  Check that MEO responds with an error when it receives a malformed request when a new grant request is performed
    ...  Check that MEO responds with an error when it receives a malformed request when a new grant request is performed
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.6.1.3.2
    ...  ETSI GS MEC 010-2 3.2.1, clause 7.6.1.3.2
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Create a GRANT request    grantBadRequest
    Create a GRANT request    grantBadRequest
    Check HTTP Response Status Code Is    400
    Check HTTP Response Status Code Is    400
@@ -38,9 +38,9 @@ TC_MEC_MEC010p2_MEO_GRANT_001_BR
TC_MEC_MEC010p2_MEO_GRANT_002_OK
TC_MEC_MEC010p2_MEO_GRANT_002_OK
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_002_OK  
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_002_OK  
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  Check that MEO sends a synchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1        //GrantRequest
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.2.2-1        //GrantRequest
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.4.2-1
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    Create a GRANT request    grantRequest2
    Create a GRANT request    grantRequest2
    Check HTTP Response Status Code Is    201
    Check HTTP Response Status Code Is    201
@@ -51,10 +51,10 @@ TC_MEC_MEC010p2_MEO_GRANT_002_OK
TC_MEC_MEC010p2_MEO_GRANT_003_OK
TC_MEC_MEC010p2_MEO_GRANT_003_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_003_OK
    [Documentation]   TP_MEC_MEC010p2_MEO_GRANT_003_OK
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.2.2-1 Note 2 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous  id
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous  id
    Create a GRANT request    grantRequestAsynchronous
    Create a GRANT request    grantRequestAsynchronous
@@ -65,9 +65,9 @@ TC_MEC_MEC010p2_MEO_GRANT_003_OK
TC_MEC_MEC010p2_MEO_GRANT_004_OK
TC_MEC_MEC010p2_MEO_GRANT_004_OK
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_004_OK 
    [Documentation]  TP_MEC_MEC010p2_MEO_GRANT_004_OK 
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  Check that MEO sends an asynchronous grant response when a grant request is requested
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.2.1, clause 7.5.1.3.1
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.2.2-1 (GrantRequest)
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1 (Grant)
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.4.2-1 (Grant)
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous2  id
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous2  id
    Create a GRANT request    grantRequestAsynchronous2
    Create a GRANT request    grantRequestAsynchronous2
@@ -79,8 +79,8 @@ TC_MEC_MEC010p2_MEO_GRANT_005_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_005_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_005_OK
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 3.2.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1  
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.4.2-1  
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Setup]      Test Setup   ${None}   grantRequestAsynchronous    ${REGISTER_ACTION}
    [Setup]      Test Setup   ${None}   grantRequestAsynchronous    ${REGISTER_ACTION}
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous  id
    ${GRANT_ID_VALUE}   Get value entry from JSON file    grantRequestAsynchronous  id
@@ -95,8 +95,8 @@ TC_MEC_MEC010p2_MEO_GRANT_006_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_OK
    [Documentation]    TP_MEC_MEC010p2_MEO_GRANT_006_OK
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  Check that MEO sends the status of a grant request when a query on a granting ID is performed.
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  The process of creating the grant is ongoing, no grant is available yet 
    ...  ETSI GS MEC 010-2 3.1.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 3.2.1, clause 7.5.2.3.2
    ...  ETSI GS MEC 010-2 3.1.1, Table 6.2.4.4.2-1  
    ...  ETSI GS MEC 010-2 3.2.1, Table 6.2.4.4.2-1  
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Tags]    PIC_GRANTS_MANAGEMENT    INCLUDE_UNDEFINED_SCHEMAS
    [Setup]      Test Setup   ${None}   grantRequest    ${REGISTER_ACTION}
    [Setup]      Test Setup   ${None}   grantRequest    ${REGISTER_ACTION}
    Get an individual grant     ${setup_response['body']['id']}
    Get an individual grant     ${setup_response['body']['id']}
+58 −58

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ ${APP_NAME} appName
${CHECKSUM}                         SHA-256
${CHECKSUM}                         SHA-256
${OPERATIONAL_STATE}                ENABLED
${OPERATIONAL_STATE}                ENABLED
${ONBOARDING_STATE}                 CREATED
${ONBOARDING_STATE}                 CREATED
${ONBOARDING_STATE_ONBOARDED}       ONBOARDED
${USAGE_STATE}                      NOT_IN_USE
${USAGE_STATE}                      NOT_IN_USE
${APP_PKG_ID}                       01234782-2c70-4e47-9a4e-0ee3a1a00123
${APP_PKG_ID}                       01234782-2c70-4e47-9a4e-0ee3a1a00123
${ON_BOARDED_APP_PKG_ID}            5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
${ON_BOARDED_APP_PKG_ID}            5abe4782-2c70-4e47-9a4e-0ee3a1a0fd1f
+10 −4
Original line number Original line Diff line number Diff line
@@ -554,9 +554,6 @@
											"x-etsi-mec-cardinality": "1",
											"x-etsi-mec-cardinality": "1",
											"x-etsi-mec-origin-type": "String"
											"x-etsi-mec-origin-type": "String"
										},
										},
										"tunnelSpecificData": {
											"type": "string"
										},
										"tunnelSrcAddress": {
										"tunnelSrcAddress": {
											"description": "Source address of the tunnel.",
											"description": "Source address of the tunnel.",
											"type": "string",
											"type": "string",
@@ -612,6 +609,14 @@
									"x-etsi-mec-cardinality": "0..1",
									"x-etsi-mec-cardinality": "0..1",
									"x-etsi-mec-origin-type": "Int"
									"x-etsi-mec-origin-type": "Int"
								},
								},
								"direction": {
									"description": "Identifies the direction of the data flow when the value of 'filterType' is 'per FLOW'. See note. Permitted values: 00= Downlink (towards the UE), 01 = Uplink (away from the UE)",
									"type": "string",
									"enum": [
										"00",
										"01"
									]
								},
								"dstAddress": {
								"dstAddress": {
									"description": "A IP address or a range of IP addresses.For IPv4, the IP address could be an IP address plus mask, or an individual IP address, or a range of IP addresses.For IPv6, the IP address could be an IP prefix, or a range of IP prefixes.",
									"description": "A IP address or a range of IP addresses.For IPv4, the IP address could be an IP address plus mask, or an individual IP address, or a range of IP addresses.For IPv6, the IP address could be an IP prefix, or a range of IP prefixes.",
									"items": {
									"items": {
@@ -748,7 +753,8 @@
					"action"
					"action"
				],
				],
				"type": "object",
				"type": "object",
				"x-etsi-ref": "6.2.1.9"
				"x-etsi-ref": "6.2.1.9",
				"x-etsi-notes": "NOTE:\tWhen direction, srcAddress, dstAddress, srcPort, dstPort and protocol are combined to describe a IP flow traffic filter which is transferred to 5G core network by MEC system, this group of attributes follows the rules specified in the clause 5.3.8 of ETSI TS 129 214 [22]."
			},
			},
			"minItems": 0,
			"minItems": 0,
			"type": "array",
			"type": "array",
+0 −31
Original line number Original line Diff line number Diff line
@@ -3,12 +3,7 @@
        "type": "object",
        "type": "object",
        "required": [
        "required": [
          "id",
          "id",
          "appDId",
          "appName",
          "appSoftwareVersion",
          "appDVersion",
          "checksum",
          "checksum",
          "softwareImages",
          "onboardingState",
          "onboardingState",
          "operationalState",
          "operationalState",
          "usageState",
          "usageState",
@@ -19,26 +14,6 @@
            "description": "Identifier of the onboarded application package.",
            "description": "Identifier of the onboarded application package.",
            "type": "string"
            "type": "string"
          },
          },
          "appDId": {
            "description": "Identifier of this MEC application descriptor. This attribute shall be globally unique.",
            "type": "string"
          },
          "appProvider": {
            "description": "Provider of the application and of the AppD.",
            "type": "string"
          },
          "appName": {
            "description": "Name to identify the MEC application.",
            "type": "string"
          },
          "appSoftwareVersion": {
            "description": "Software version of the application. This is updated when there is any change to the software in the onboarded application package.",
            "type": "string"
          },
          "appDVersion": {
            "description": "Identifies the version of the application descriptor.",
            "type": "string"
          },
          "checksum": {
          "checksum": {
            "description": "",
            "description": "",
            "properties": {
            "properties": {
@@ -57,12 +32,6 @@
            ],
            ],
            "type": "object"
            "type": "object"
          },
          },
          "softwareImages": {
            "description": "Information of application software image in application package. Type is TBD"
          },
          "additionalArtifacts": {
            "description": "Additional information of application package artifacts that are not application software images. Type is TBD"
          },
          "onboardingState": {
          "onboardingState": {
            "description": "Onboarding state of application package",
            "description": "Onboarding state of application package",
            "type": "string",
            "type": "string",
Loading