Commit 40549b93 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix issue #43

parent 98f07139
Loading
Loading
Loading
Loading
+743 −774
Original line number Diff line number Diff line
@@ -3,6 +3,12 @@
				"properties": {
					"apId": {
						"properties": {
							"bssid": {
								"description": "Basic Service Set Identifier (BSSID) is a unique Identifier assigned to an Access Point (as network interface controller) for communications at the data link layer of a network segment. BSSID is typically set to an access point's MAC address.",
								"type": "string",
								"x-etsi-mec-cardinality": "1",
								"x-etsi-mec-origin-type": "String"
							},
							"ipAddress": {
								"description": "IPv4 or IPv6 address allocated for the Access Point.",
								"items": {
@@ -13,14 +19,8 @@
								"x-etsi-mec-cardinality": "0..N",
								"x-etsi-mec-origin-type": "String"
							},
        "macId": {
          "description": "Unique Identifier assigned to an Access Point (as network interface controller) for communications at the data link layer of a network segment.",
          "type": "string",
          "x-etsi-mec-cardinality": "1",
          "x-etsi-mec-origin-type": "String"
        },
							"ssid": {
          "description": "Service Set Identifier to identify logical networks including Basic Service Set and Extended Service Set.",
								"description": "Service Set Identifier (SSID) to identify logical WLAN networks available via the Access Point.",
								"items": {
									"type": "string"
								},
@@ -31,7 +31,7 @@
							}
						},
						"required": [
        "macId"
							"bssid"
						],
						"type": "object",
						"x-etsi-ref": "6.5.3"
@@ -248,7 +248,7 @@
							"geolocation": {
								"properties": {
									"altitude": {
              "description": "The altitude value of location as defined in IETF RFC6225 [6]",
										"description": "The altitude value of location as defined in IETF RFC 6225 [6]",
										"format": "uint32",
										"type": "integer",
										"x-etsi-mec-cardinality": "0..1",
@@ -276,8 +276,8 @@
										"x-etsi-mec-origin-type": "Uint8"
									},
									"lat": {
              "description": "The latitude value of location as defined in IETF RFC6225 [6]",
              "format": "int64",
										"description": "The latitude value of location as defined in IETF RFC 6225 [6]",
										"format": "uint64",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint64"
@@ -290,8 +290,8 @@
										"x-etsi-mec-origin-type": "Uint8"
									},
									"long": {
              "description": "The longitude value of location as defined in IETF RFC6225 [6]",
              "format": "int64",
										"description": "The longitude value of location as defined in IETF RFC 6225 [6]",
										"format": "uint64",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint64"
@@ -318,53 +318,6 @@
						"type": "object",
						"x-etsi-ref": "6.5.9"
					},
    "apNeighbor": {
      "properties": {
        "bssid": {
          "description": "BSS Id of the Access Point that is being reported.",
          "type": "string",
          "x-etsi-mec-cardinality": "1",
          "x-etsi-mec-origin-type": "String"
        },
        "bssidInfo": {
          "description": "Additional information related to Access Point that is being reported such as AP reachability, security, key scope, Mobility Domain, HT/VHT capability and Fine Time Measurements.",
          "format": "uint32",
          "type": "integer",
          "x-etsi-mec-cardinality": "1",
          "x-etsi-mec-origin-type": "UInt32"
        },
        "channel": {
          "description": "The channel currently used by this Access Point.",
          "format": "uint8",
          "type": "integer",
          "x-etsi-mec-cardinality": "1",
          "x-etsi-mec-origin-type": "Uint8"
        },
        "operatingClass": {
          "description": "The channel set of the AP indicated by this BSSID.",
          "format": "uint8",
          "type": "integer",
          "x-etsi-mec-cardinality": "1",
          "x-etsi-mec-origin-type": "Uint8"
        },
        "phyType": {
          "description": "PHY type of the AP indicated by this BSSID. It is an integer value coded according to the value of the dot11PHYType.",
          "format": "uint8",
          "type": "integer",
          "x-etsi-mec-cardinality": "1",
          "x-etsi-mec-origin-type": "Uint8"
        }
      },
      "required": [
        "bssid",
        "bssidInfo",
        "operatingClass",
        "channel",
        "phyType"
      ],
      "type": "object",
      "x-etsi-ref": "6.5.10"
    },
					"bssLoad": {
						"properties": {
							"availAdmCap": {
@@ -375,7 +328,7 @@
								"x-etsi-mec-origin-type": "Uint16"
							},
							"channelUtilization": {
          "description": "The percentage of time, linearly scaled with 255 representing 100%, that the AP sensed the medium was busy, as indicated by either the physical or virtual Carrier Sense (CS) mechanism.",
								"description": "The percentage of time, linearly scaled with 255 representing 100 %, that the AP sensed the medium was busy, as indicated by either the physical or virtual Carrier Sense (CS) mechanism.",
								"format": "uint8",
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
@@ -435,7 +388,7 @@
								"x-etsi-mec-origin-type": "Uint8"
							},
							"spatStreamUnderUtil": {
          "description": "The percentage of time, linearly scaled with 255 representing 100%, that the AP has underutilized spatial domain resources for given busy time of the medium.",
								"description": "The percentage of time, linearly scaled with 255 representing 100 %, that the AP has underutilized spatial domain resources for given busy time of the medium.",
								"format": "uint8",
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
@@ -452,6 +405,51 @@
						"type": "object",
						"x-etsi-ref": "6.5.8"
					},
					"oBssLoad": {
						"properties": {
							"allocatedTrafficSelfMean": {
								"description": "Mean of allocated traffic from this AP (BSS) in units of 32 µs per second.",
								"format": "uint16",
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
								"x-etsi-mec-origin-type": "Uint16"
							},
							"allocatedTrafficSelfStdDev": {
								"description": "Standard deviation from the mean of allocation traffic from this BSS in units of 32 µs per second.",
								"format": "uint16",
								"type": "integer",
								"x-etsi-mec-cardinality": "0..1",
								"x-etsi-mec-origin-type": "Uint16"
							},
							"allocatedTrafficShareMean": {
								"description": "Mean of the sum of allocated traffic from other APs on the overlapping channel in unit of 32 µs per second.",
								"format": "uint16",
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
								"x-etsi-mec-origin-type": "Uint16"
							},
							"allocatedTrafficShareStdDev": {
								"description": "Standard deviation from the mean of the sum of allocated traffic from other APs on the overlapping channel in unit of 32 µs per second.",
								"format": "uint16",
								"type": "integer",
								"x-etsi-mec-cardinality": "0..1",
								"x-etsi-mec-origin-type": "Uint16"
							},
							"overlap": {
								"description": "Indicates the number of other APs that are sharing the same channel as the reporting AP.",
								"format": "uint8",
								"type": "integer",
								"x-etsi-mec-cardinality": "0..1",
								"x-etsi-mec-origin-type": "Uint8"
							}
						},
						"required": [
							"allocatedTrafficSelfMean",
							"allocatedTrafficShareMean"
						],
						"type": "object",
						"x-etsi-ref": "6.5.40"
					},
					"timeStamp": {
						"properties": {
							"nanoSeconds": {
@@ -479,7 +477,7 @@
					"wanMetrics": {
						"properties": {
							"downlinkLoad": {
          "description": "1-octet positive integer representing the current percentage loading of the downlink WAN connection, scaled linearly with 255 representing 100 %, as measured over an interval the duration of which is reported in Load Measurement Duration. In cases where the downlink load is unknown to the AP, the value is set to zero.",
								"description": "1-octet positive integer representing the current percentage loading of the downlink WAN connection, scaled linearly with 255 representing 100 %, as measured over an interval the duration of which is reported in Load Measurement Duration. In cases where the downlink load is unknown to the AP, the value is set to zero.",
								"format": "uint8",
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
@@ -500,7 +498,7 @@
								"x-etsi-mec-origin-type": "Uint16"
							},
							"uplinkLoad": {
          "description": "1-octet positive integer representing the current percentage loading of the uplink WAN connection, scaled linearly with 255 representing 100 %, as measured over an interval, the duration of which is reported in Load Measurement Duration. In cases where the uplink load is unknown to the AP, the value is set to zero.",
								"description": "1-octet positive integer representing the current percentage loading of the uplink WAN connection, scaled linearly with 255 representing 100 %, as measured over an interval, the duration of which is reported in Load Measurement Duration. In cases where the uplink load is unknown to the AP, the value is set to zero.",
								"format": "uint8",
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
@@ -537,60 +535,46 @@
							"dmg": {
								"properties": {
									"ExtScMcsCap": {
              "description": "Extended SC MCS capabilities as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "Extended SC MCS capabilities as defined in IEEE 802.11-2016 [8].",
										"format": "uint8",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint8"
									},
									"dmgApOrPcpCapInfo": {
              "description": "DMG AP or PCP capabilities information as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "DMG AP or PCP capabilities information as defined in IEEE 802.11-2016 [8].",
										"format": "uint16",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint16"
									},
									"dmgStaBeamTrackTimeLimit": {
              "description": "DMG station beam tracking time limit as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "DMG station beam tracking time limit as defined in IEEE 802.11-2016 [8]. ",
										"format": "uint16",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint16"
									},
									"dmgStaCapInfo": {
              "description": "DMG station capabilities information as defined in draft IEEE P802.11/D4.0 [i.11]",
              "format": "int64",
										"description": "DMG station capabilities information as defined in IEEE 802.11-2016 [8]. ",
										"format": "uint64",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint64"
									},
									"maxNrBasicAmsduSubframes": {
              "description": "Number of basic A-MSDU subframes in A-MSDU as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "Number of basic A-MSDU subframes in A-MSDU as defined in IEEE 802.11-2016 [8].",
										"format": "uint8",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint8"
									},
									"maxNrShortAmsduSubframes": {
              "description": "Number of short A-MSDU subframes in A-MSDU as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "Number of short A-MSDU subframes in A-MSDU as defined in IEEE 802.11-2016 [8].",
										"format": "uint8",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint8"
            },
            "sarCap": {
              "description": "SAR capabilities as defined in draft IEEE P802.11/D4.0 [i.11]",
              "format": "uint8",
              "type": "integer",
              "x-etsi-mec-cardinality": "1",
              "x-etsi-mec-origin-type": "Uint8"
            },
            "tddCap": {
              "description": "TDD capabilities as defined in draft IEEE P802.11/D4.0 [i.11]",
              "format": "uint16",
              "type": "integer",
              "x-etsi-mec-cardinality": "1",
              "x-etsi-mec-origin-type": "Uint16"
									}
								},
								"required": [
@@ -599,9 +583,7 @@
									"dmgStaBeamTrackTimeLimit",
									"ExtScMcsCap",
									"maxNrBasicAmsduSubframes",
            "maxNrShortAmsduSubframes",
            "tddCap",
            "sarCap"
									"maxNrShortAmsduSubframes"
								],
								"type": "object",
								"x-etsi-ref": "6.5.17"
@@ -609,28 +591,21 @@
							"edmg": {
								"properties": {
									"ampduParameters": {
              "description": "A-MPDU parameters as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "A-MPDU parameters as defined in draft IEEE P802.11ay [i.11]",
										"format": "uint8",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint8"
									},
            "reserved": {
              "description": "",
              "format": "uint8",
              "type": "integer",
              "x-etsi-mec-cardinality": "0..1",
              "x-etsi-mec-origin-type": "Uint8"
            },
									"supportedMcs": {
              "description": "Supported MCS as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "Supported MCS as defined in draft IEEE P802.11ay [i.11]",
										"format": "uint32",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint32"
									},
									"trnParameters": {
              "description": "Training parameters as defined in draft IEEE P802.11/D4.0 [i.11]",
										"description": "Training parameters as defined in draft IEEE P802.11ay [i.11]",
										"format": "uint16",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
@@ -661,12 +636,6 @@
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "Uint8"
									},
            "ppeThresholds": {
              "description": "PPE Threshold determines the nominal packet padding value for a HE PPDU.",
              "type": "integer",
              "x-etsi-mec-cardinality": "0..1",
              "x-etsi-mec-origin-type": "not defined"
            },
									"supportedHeMcsNssSet": {
										"description": "Supported MCS and NSS Set.",
										"format": "uint8",
@@ -750,7 +719,7 @@
									},
									"vhtMcsNss": {
										"description": "Supported VHT-MCS and NSS Set as defined in IEEE 802.11-2016 [8].",
              "format": "int64",
										"format": "uint64",
										"type": "integer",
										"x-etsi-mec-cardinality": "1",
										"x-etsi-mec-origin-type": "UInt64"
+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ TP_MEC_MEC028_SRV_WAI_008_NF
    Check HTTP Response Status Code Is    404
 

*** Test Cases ***
TP_MEC_MEC028_SRV_WAI_009_OK
    [Documentation] 
    ...  Check that the IUT responds with a Notification Subscription when it is modified"
+159 −108
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@
							"self": {
								"properties": {
									"href": {
              "description": "URI referring to a resource",
              "type": "string",
              "x-etsi-mec-cardinality": "1",
              "x-etsi-mec-origin-type": "String"
										"type": "string"
									}
								},
								"required": [
@@ -28,6 +25,12 @@
					},
					"apId": {
						"properties": {
							"bssid": {
								"description": "Basic Service Set Identifier (BSSID) is a unique Identifier assigned to an Access Point (as network interface controller) for communications at the data link layer of a network segment. BSSID is typically set to an access point's MAC address.",
								"type": "string",
								"x-etsi-mec-cardinality": "1",
								"x-etsi-mec-origin-type": "String"
							},
							"ipAddress": {
								"description": "IPv4 or IPv6 address allocated for the Access Point.",
								"items": {
@@ -38,14 +41,8 @@
								"x-etsi-mec-cardinality": "0..N",
								"x-etsi-mec-origin-type": "String"
							},
        "macId": {
          "description": "Unique Identifier assigned to an Access Point (as network interface controller) for communications at the data link layer of a network segment.",
          "type": "string",
          "x-etsi-mec-cardinality": "1",
          "x-etsi-mec-origin-type": "String"
        },
							"ssid": {
          "description": "Service Set Identifier to identify logical networks including Basic Service Set and Extended Service Set.",
								"description": "Service Set Identifier (SSID) to identify logical WLAN networks available via the Access Point.",
								"items": {
									"type": "string"
								},
@@ -56,17 +53,13 @@
							}
						},
						"required": [
        "macId"
							"bssid"
						],
						"type": "object",
						"x-etsi-ref": "6.5.3"
					},
					"callbackReference": {
      "description": "URI selected by the service consumer to receive notifications on the subscribed WLAN information. This shall be included both in the request and in response.",
      "format": "uri",
      "type": "string",
      "x-etsi-mec-cardinality": "1",
      "x-etsi-mec-origin-type": "URI"
						"type": "string"
					},
					"expiryDeadline": {
						"properties": {
@@ -92,18 +85,76 @@
						"type": "object",
						"x-etsi-ref": "6.5.2"
					},
					"notificationEvent": {
						"description": "Set for trigger-based event notification reporting. ",
						"properties": {
							"threshold": {
								"description": "Number of connected stations threshold for trigger-based event reporting.",
								"format": "uint8",
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
								"x-etsi-mec-origin-type": "Uint8"
							},
							"trigger": {
								"description": "Trigger for the notification:\n1 = Notification issued when the number of connected stations is greater than or equal to the threshold.\n2 = Notification issued when the number of connected stations is less than or equal to the threshold.",
								"enum": [
									1,
									2
								],
								"type": "integer",
								"x-etsi-mec-cardinality": "1",
								"x-etsi-mec-origin-type": "Enum (inline)"
							}
						},
						"required": [
							"trigger",
							"threshold"
						],
						"type": "object",
						"x-etsi-mec-cardinality": "0..1",
						"x-etsi-mec-origin-type": "Structure (inline)"
					},
					"notificationPeriod": {
						"description": "Set for periodic notification reporting.\nValue indicates the notification period in seconds.",
						"format": "uint8",
						"type": "integer",
						"x-etsi-mec-cardinality": "0..1",
						"x-etsi-mec-origin-type": "Uint8"
					},
					"requestTestNotification": {
						"description": "Set to TRUE by the service consumer to request a test notification on the callbackReference URI to determine if it is reachable by the WAIS for notifications.",
						"type": "boolean",
						"x-etsi-mec-cardinality": "0..1",
						"x-etsi-mec-origin-type": "Boolean"
					},
					"subscriptionType": {
						"description": "Shall be set to \"AssocStaSubscription\".",
						"type": "string",
						"x-etsi-mec-cardinality": "1",
						"x-etsi-mec-origin-type": "String"
					},
					"websockNotifConfig": {
						"properties": {
							"requestWebsocketUri": {
								"description": "Set to true by the service consumer to indicate that Websocket delivery is requested.",
								"type": "boolean",
								"x-etsi-mec-cardinality": "0..1",
								"x-etsi-mec-origin-type": "Boolean"
							},
							"websocketUri": {
								"description": "Set by WAIS to indicate to the service consumer the Websocket URI to be used for delivering notifications.",
								"type": "string"
							}
						},
						"type": "object",
						"x-etsi-ref": "6.3.6"
					}
				},
				"required": [
					"subscriptionType",
    "callbackReference",
					"apId"
				],
				"type": "object",
				"x-etsi-notes": "NOTE 1:\tAt least one of callbackReference and websockNotifConfig shall be provided by the service consumer. If both are provided, it is up to WAIS to select the method to be used for notifications and to return only that method in the response.\nNOTE 2:\tAssocStaSubscription shall include either notificationPeriod or notificationEvent.\nNOTE 3:\tIf both notificationPeriod and notificationEvent attributes are set, notifications are issued periodically when the trigger threshold is satisfied.",
				"x-etsi-ref": "6.3.2"
			}
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ Update a specified measurement configuration
    Set Headers    {"Accept":"application/json"}
    Set Headers    {"Content-Type":"*/*"}
    Set Headers    {"Authorization":"${TOKEN}"}
    GET     ${apiRoot}/${apiName}/${apiVersion}/queries/measurement/${MEAS_CONF_ID}    ${body}
    PUT     ${apiRoot}/${apiName}/${apiVersion}/queries/measurement/${MEAS_CONF_ID}    ${content}
    ${output}=    Output    response
    Set Suite Variable    ${response}    ${output}
    
@@ -183,7 +183,7 @@ Delete a specified measurement configuration
    Set Headers    {"Accept":"application/json"}
    Set Headers    {"Content-Type":"*/*"}
    Set Headers    {"Authorization":"${TOKEN}"}
    GET     ${apiRoot}/${apiName}/${apiVersion}/queries/measurement/${MEAS_CONF_ID} 
    DELETE     ${apiRoot}/${apiName}/${apiVersion}/queries/measurement/${MEAS_CONF_ID}
    ${output}=    Output    response
    Set Suite Variable    ${response}    ${output}
    
+224 −227

File changed.

Preview size limit exceeded, changes collapsed.

Loading