[TrafficManager] Real User Metrics (RUM) fixes (#1920)

* [Traffic Manager] Adding new RealtimeUserMetrics preview feature to Traffic Manager. [Traffic Manager] Adding new RealtimeUserMetrics preview feature to Traffic Manager. * [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. * [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. * [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. * [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. * [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. * [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. * [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. [Traffic Manager] Adding new Realtime User Metrics (RUM) preview feature. * RUM fixes Changes for real user metrics * Revert "RUM fixes" This reverts commit b703b5e7f0f8ae21221387129e49a0114ae68b93. * RUM fixes * RUM fixes * Remove unreferenced metrics key properties / model from 2017-05-01 * Remove files * [TrafficManager] Real User Metrics (RUM) fixes II - remove default from resource ID and operation ID [TrafficManager] Real User Metrics (RUM) fixes II - remove default from resource ID and operation ID
Azure · Nov 2, 2017 · 342d0f9 · 342d0f9
1 parent 7d65d93
commit 342d0f9
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 70 deletions.
diff --git a/...fication/trafficmanager/resource-manager/Microsoft.Network/2017-05-01/trafficmanager.json b/...fication/trafficmanager/resource-manager/Microsoft.Network/2017-05-01/trafficmanager.json
@@ -1106,30 +1106,6 @@
       },
       "description": "The content of an error returned by the Azure Resource Manager",
       "x-ms-external": true
-    },
-    "TrafficManagerUserMetricsKeyProperties": {
-      "properties": {
-        "key": {
-          "type" : "string",
-          "description": "The key returned by the Realtime User Metrics operation."
-        }
-      },
-      "description": "Class representing the properties of a Real User Metrics key operation response."
-    },
-    "TrafficManagerUserMetricsKeyModel": {
-      "properties": {
-        "properties": {
-          "x-ms-client-flatten": true,
-          "$ref": "#/definitions/TrafficManagerUserMetricsKeyProperties",
-          "description": "The key property returned from a Realtime User Metrics GET operation."
-        }
-      },
-      "allOf": [
-        {
-          "$ref": "#/definitions/ProxyResource"
-        }
-      ],
-      "description": "Class representing a Traffic Manager Real User Metrics key response."
     }
   },
   "parameters": {

diff --git a/...icManagerUserMetricsKeys-GET-default.json → ...es/TrafficManagerUserMetricsKeys-GET.json b/...icManagerUserMetricsKeys-GET-default.json → ...es/TrafficManagerUserMetricsKeys-GET.json
@@ -9,13 +9,8 @@
         "id": "/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default",
         "name": "default",
         "type": "Microsoft.Network/trafficManagerUserMetricsKeys",
-        "properties": {
-            "key": "9ea056eb38f145a0891b5d5dc15e9aa2"
-        }
+        "key": "9ea056eb38f145a0891b5d5dc15e9aa2"
       }
-    },
-    "204": {
-      "body": ""
     }
   }
 }
diff --git a/...ager/Microsoft.Network/2017-09-01-preview/examples/TrafficManagerUserMetricsKeys-PUT.json b/...ager/Microsoft.Network/2017-09-01-preview/examples/TrafficManagerUserMetricsKeys-PUT.json
@@ -5,7 +5,12 @@
   },
   "responses": {
     "201": {
-      "body": ""
+      "body": {
+        "id": "/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default",
+        "name": "default",
+        "type": "Microsoft.Network/trafficManagerUserMetricsKeys",
+        "key": "9ea056eb38f145a0891b5d5dc15e9aa2"
+      }
     }
   }
 }
diff --git a/...anager/resource-manager/Microsoft.Network/2017-09-01-preview/trafficmanageranalytics.json b/...anager/resource-manager/Microsoft.Network/2017-09-01-preview/trafficmanageranalytics.json
@@ -109,13 +109,13 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/trafficManagerUserMetricsKeys/default": {
+    "/subscriptions/{subscriptionId}/providers/Microsoft.Network/trafficManagerUserMetricsKeys": {
       "get": {
         "tags": [
-          "RealtimeUserMetrics"
+          "RealUserMetrics"
         ],
-        "operationId": "TrafficManagerUserMetricsKeys_GetDefault",
-        "description": "Get the subscription-level key used for Realtime User Metrics collection.",
+        "operationId": "TrafficManagerUserMetricsKeys_Get",
+        "description": "Get the subscription-level key used for Real User Metrics collection.",
         "parameters": [
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -126,14 +126,11 @@
         ],
         "responses": {
           "200": {
-            "description": "The subscription-level Traffic Manager Realtime User Metrics key.",
+            "description": "The subscription-level Traffic Manager Real User Metrics key.",
             "schema": {
               "$ref": "#/definitions/TrafficManagerUserMetricsKeyModel" 
             }
           },
-          "204": {
-            "description": "There is no Realtime User Metrics key for this subscription."
-          },
           "default": {
             "description": "Default response. It will be deserialized as per the Error definition.",
             "schema": {
@@ -142,17 +139,17 @@
           }
         },
         "x-ms-examples": {
-          "TrafficManagerUserMetricsKeys-GET-default": {
-            "$ref": "./examples/TrafficManagerUserMetricsKeys-GET-default.json"
+          "TrafficManagerUserMetricsKeys-GET": {
+            "$ref": "./examples/TrafficManagerUserMetricsKeys-GET.json"
           }
         }
       },
       "put": {
         "tags": [
-          "RealtimeUserMetrics"
+          "RealUserMetrics"
         ],
         "operationId": "TrafficManagerUserMetricsKeys_CreateOrUpdate",
-        "description": "Create or update a subscription-level key used for Realtime User Metrics collection.",
+        "description": "Create or update a subscription-level key used for Real User Metrics collection.",
         "parameters": [
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -163,7 +160,7 @@
         ],
         "responses": {
           "201": {
-            "description": "A new subscription-level key has been created for Realtime User Metrics collection.",
+            "description": "A new subscription-level key has been created for Real User Metrics collection.",
             "schema": {
               "$ref": "#/definitions/TrafficManagerUserMetricsKeyModel" 
             }            
@@ -183,10 +180,10 @@
       },
       "delete": {
         "tags": [
-          "RealtimeUserMetrics"
+          "RealUserMetrics"
         ],
         "operationId": "TrafficManagerUserMetricsKeys_Delete",
-        "description": "Delete a subscription-level key used for Realtime User Metrics collection.",
+        "description": "Delete a subscription-level key used for Real User Metrics collection.",
         "parameters": [
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -197,7 +194,7 @@
         ],
         "responses": {
           "200": {
-            "description": "The Traffic Manager Realtime User Metrics key was deleted successfully.",
+            "description": "The Traffic Manager Real User Metrics key was deleted successfully.",
             "schema": {
               "$ref": "#/definitions/DeleteOperationResult"
             }
@@ -430,30 +427,32 @@
       ],
       "description": "Class representing a Traffic Manager HeatMap."
     },
-    "TrafficManagerUserMetricsKeyProperties": {
-       "properties": {
-         "key": {
-           "type" : "string",
-           "description": "The key returned by the Realtime User Metrics operation."
-         }
-       },
-       "description": "Class representing the properties of a Real User Metrics key operation response."
-     },
-     "TrafficManagerUserMetricsKeyModel": {
-       "properties": {
-         "properties": {
-           "x-ms-client-flatten": true,
-           "$ref": "#/definitions/TrafficManagerUserMetricsKeyProperties",
-           "description": "The key property returned from a Realtime User Metrics GET operation."
-         }
-       },
-       "allOf": [
-         {
-           "$ref": "#/definitions/ProxyResource"
-         }
+    "TrafficManagerUserMetricsKeyModel": {
+      "properties": {
+        "id": {
+          "type" : "string",
+          "description": "Fully qualified resource Id for the resource. Ex - /providers/Microsoft.Network/trafficManagerUserMetricsKeys"
+        },
+        "name": {
+          "type" : "string",
+          "description": "The word default."
+        },
+        "type": {
+          "type" : "string",
+          "description": "The type of the resource. Ex- Microsoft.Network/trafficManagerUserMetricsKeys."
+        },
+        "key": {
+          "type" : "string",
+          "description": "The key returned by the Real User Metrics operation."
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/ProxyResource"
+        }
       ],
-       "description": "Class representing a Traffic Manager Real User Metrics key response."
-      }
+      "description": "Class representing a Traffic Manager Real User Metrics key response."
+    }
   },
   "parameters": {
     "SubscriptionIdParameter": {