Add ADF V2 Integration Runtime APIs - Fixed the model validation issues

specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/entityTypes/IntegrationRuntime.json

@@ -13,7 +13,7 @@
       "properties": {
         "type": {
           "description": "Type of integration runtime.",
-          "type": "string"
+          "$ref": "#/definitions/IntegrationRuntimeType"
         },
         "description": {
           "description": "Integration runtime description.",
@@ -27,6 +27,18 @@
         "type"
       ]
     },
+    "IntegrationRuntimeType": {
+      "description": "The type of integration runtime.",
+      "type": "string",
+      "enum": [
+        "Managed",
+        "SelfHosted"
+      ],
+      "x-ms-enum": {
+        "name": "IntegrationRuntimeType",
+        "modelAsString": true
+      }
+    },
     "ManagedIntegrationRuntime": {
       "x-ms-discriminator-value": "Managed",
       "description": "Managed integration runtime, including managed elastic and managed dedicated integration runtimes.",
@@ -138,7 +150,9 @@
         },
         "catalogAdminUserName": {
           "description": "The administrator user name of catalog database.",
-          "type": "string"
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 128
         },
         "catalogAdminPassword": {
           "description": "The password of the administrator user account of the catalog database.",
@@ -152,7 +166,7 @@
             "Standard",
             "Premium",
             "PremiumRS"
-          ], 
+          ],
           "x-ms-enum": {
             "name": "IntegrationRuntimeSsisCatalogPricingTier",
             "modelAsString": true
@@ -180,7 +194,7 @@
       "properties": {
         "type": {
           "description": "Type of integration runtime.",
-          "type": "string"
+          "$ref": "#/definitions/IntegrationRuntimeType"
         },
         "state": {
           "description": "The state of integration runtime.",
@@ -297,6 +311,11 @@
             "description": "Error message parameters."
           },
           "readOnly": true
+        },
+        "activityId": {
+          "description": "The activity id for the operation request.",
+          "type": "string",
+          "readOnly": true
         }
       },
       "additionalProperties": {
@@ -467,19 +486,29 @@
         },
         "autoUpdate": {
           "description": "Whether Self-hosted integration runtime auto update has been turned on.",
+          "$ref": "#/definitions/IntegrationRuntimeAutoUpdate",
+          "readOnly": true
+        },
+        "versionStatus": {
+          "description": "Status of the integration runtime version.",
           "type": "string",
-          "enum": [
-            "On",
-            "Off"
-          ],
-          "x-ms-enum": {
-            "name": "IntegrationRuntimeAutoUpdate",
-            "modelAsString": true
-          },
           "readOnly": true
         }
       }
     },
+    "IntegrationRuntimeAutoUpdate": {
+      "description": "The state of integration runtime auto update.",
+      "type": "string",
+      "readOnly": true,
+      "enum": [
+        "On",
+        "Off"
+      ],
+      "x-ms-enum": {
+        "name": "IntegrationRuntimeAutoUpdate",
+        "modelAsString": true
+      }
+    },
     "SelfHostedIntegrationRuntimeNode": {
       "description": "Properties of Self-hosted integration runtime node.",
       "properties": {
@@ -758,6 +787,17 @@
       "additionalProperties": {
         "type": "object"
       }
+    },
+    "IntegrationRuntimeNodeIpAddress": {
+      "type": "object",
+      "description": "The IP address of self-hosted integration runtime node.",
+      "properties": {
+        "ipAddress": {
+          "description": "The IP address of self-hosted integration runtime node.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
     }
   }
 }

specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/examples/IntegrationRuntimeNodes_Delete.json

@@ -0,0 +1,28 @@
+{
+  "parameters": {
+    "subscriptionId": "12345678-1234-1234-12345678abc",
+    "resourceGroupName": "exampleResourceGroup",
+    "factoryName": "exampleFactoryName",
+    "integrationRuntimeName": "exampleIntegrationRuntime",
+    "nodeName": "Node_1",
+    "api-version": "2017-09-01-preview"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Date": "Thu, 19 Oct 2017 15:22:16 GMT",
+        "x-ms-request-id": "75a166f9-75ed-48d9-bc9b-08682dfdd0eb",
+        "X-Content-Type-Options": "nosniff"
+      },
+      "body": null
+    },
+    "204": {
+      "headers": {
+        "Date": "Thu, 19 Oct 2017 15:22:16 GMT",
+        "x-ms-request-id": "d05cec68-ec62-4e95-97b6-9572eeab8ef2",
+        "X-Content-Type-Options": "nosniff"
+      },
+      "body": null
+    }
+  }
+}

specification/datafactory/resource-manager/Microsoft.DataFactory/2017-09-01-preview/examples/IntegrationRuntimeNodes_GetIpAddress.json

@@ -0,0 +1,22 @@
+{
+  "parameters": {
+    "subscriptionId": "12345678-1234-1234-12345678abc",
+    "resourceGroupName": "exampleResourceGroup",
+    "factoryName": "exampleFactoryName",
+    "integrationRuntimeName": "exampleIntegrationRuntime",
+    "nodeName": "YANZHANG-02",
+    "api-version": "2017-09-01-preview"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Date": "Tue, 14 Nov 2017 03:29:46 GMT",
+        "x-ms-request-id": "6ba794e4-da5a-4760-afa8-1c68a2c9f487",
+        "X-Content-Type-Options": "nosniff"
+      },
+      "body": {
+        "ipAddress": "***"
+      }
+    }
+  }
+}