Add APIs for integration runtime sharing feature.

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

@@ -20,9 +20,6 @@
           "type": "string"
         }
       },
-      "additionalProperties": {
-        "type": "object"
-      },
       "required": [
         "type"
       ]
@@ -157,7 +154,7 @@
           "enum": [
             "Standard",
             "Enterprise"
-          ], 
+          ],
           "x-ms-enum": {
             "name": "IntegrationRuntimeEdition",
             "modelAsString": true
@@ -232,15 +229,12 @@
         "typeProperties": {
           "description": "When this property is not null, means this is a linked integration runtime. The property is used to access original integration runtime.",
           "x-ms-client-flatten": true,
-          "$ref": "#/definitions/LinkedIntegrationRuntimeTypeProperties"
+          "$ref": "#/definitions/SelfHostedIntegrationRuntimeTypeProperties"
         }
-      },
-      "required": [
-        "typeProperties"
-      ]
+      }
     },
-    "LinkedIntegrationRuntimeTypeProperties": {
-      "description": "The base definition of a secret type.",
+    "SelfHostedIntegrationRuntimeTypeProperties": {
+      "description": "The self-hosted integration runtime properties.",
       "type": "object",
       "properties": {
         "linkedInfo": {
@@ -249,13 +243,13 @@
       }
     },
     "LinkedIntegrationRuntimeProperties": {
-      "description": "The base definition of a secret type.",
+      "description": "The base definition of a linked integration runtime properties.",
       "discriminator": "authorizationType",
       "type": "object",
       "properties": {
         "authorizationType": {
           "type": "string",
-          "description": "Type of the secret."
+          "description": "The authorization type for integration runtime sharing."
         }
       },
       "required": [
@@ -264,7 +258,7 @@
     },
     "LinkedIntegrationRuntimeKey": {
       "x-ms-discriminator-value": "Key",
-      "description": "The base definition of a secret type.",
+      "description": "The key authorization type.",
       "type": "object",
       "allOf": [
         {
@@ -273,7 +267,7 @@
       ],
       "properties": {
         "key": {
-          "description": "Type of the secret.",
+          "description": "The key used for authorization.",
           "$ref": "../datafactory.json#/definitions/SecureString"
         }
       },
@@ -283,7 +277,7 @@
     },
     "LinkedIntegrationRuntimeRbac": {
       "x-ms-discriminator-value": "RBAC",
-      "description": "The base definition of a secret type.",
+      "description": "The role based access control (RBAC) authorization type.",
       "type": "object",
       "allOf": [
         {
@@ -292,7 +286,7 @@
       ],
       "properties": {
         "resourceId": {
-          "description": "The resource ID of the integration runtime to be shared.",
+          "description": "The resource identifier of the integration runtime to be shared.",
           "type": "string"
         }
       },
@@ -312,16 +306,13 @@
         "dataFactoryName": {
           "description": "The data factory name which the integration runtime belong to.",
           "type": "string",
-          "readOnly":  true
+          "readOnly": true
         },
         "state": {
           "description": "The state of integration runtime.",
           "$ref": "#/definitions/IntegrationRuntimeState",
           "readOnly": true
         }
-      },
-      "additionalProperties": {
-        "type": "object"
       }
     },
     "IntegrationRuntimeState": {
@@ -337,7 +328,8 @@
         "NeedRegistration",
         "Online",
         "Limited",
-        "Offline"
+        "Offline",
+        "AccessDenied"
       ],
       "x-ms-enum": {
         "name": "IntegrationRuntimeState",
@@ -395,6 +387,9 @@
           "$ref": "#/definitions/ManagedIntegrationRuntimeOperationResult",
           "readOnly": true
         }
+      },
+      "additionalProperties": {
+        "type": "object"
       }
     },
     "ManagedIntegrationRuntimeOperationResult": {
@@ -618,6 +613,16 @@
           "items": {
             "$ref": "#/definitions/LinkedIntegrationRuntime"
           }
+        },
+        "pushedVersion": {
+          "description": "The version that the integration runtime is going to update to.",
+          "type": "string",
+          "readOnly": true
+        },
+        "latestVersion": {
+          "description": "The latest version on download center.",
+          "type": "string",
+          "readOnly": true
         }
       }
     },

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

@@ -4,7 +4,7 @@
     "locationId": "eastus",
     "factoryRepoUpdate": {
       "resourceGroupName": "exampleResourceGroup",
-      "factoryId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname",
+      "factoryResourceId": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleresourcegroup/providers/Microsoft.DataFactory/factories/examplefactoryname",
       "vstsConfiguration": {
         "accountName": "msdata",
         "projectName": "datafactory",

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

@@ -0,0 +1,35 @@
+{
+  "parameters": {
+    "subscriptionId": "12345678-1234-1234-12345678abc",
+    "resourceGroupName": "exampleResourceGroup",
+    "factoryName": "exampleFactoryName-linked",
+    "api-version": "2017-09-01-preview"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Date": "Wed, 23 May 2018 02:26:34 GMT",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-ratelimit-remaining-subscription-writes": "1195",
+        "x-ms-request-id": "357eea75-543d-4b45-9655-63e674fcb689",
+        "x-ms-correlation-request-id": "357eea75-543d-4b45-9655-63e674fcb689"
+      },
+      "body": {
+        "value": [
+          {
+            "name": "exampleFactoryName",
+            "identity": {
+              "type": "SystemAssigned",
+              "principalId": "cf5fae31-cc0b-403d-9231-cb97c84e1101",
+              "tenantId": "12345678-1234-1234-123456789abc"
+            },
+            "id": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName",
+            "type": "Microsoft.DataFactory/factories",
+            "location": "westus",
+            "tags": {}
+          }
+        ]
+      }
+    }
+  }
+}

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

@@ -0,0 +1,33 @@
+{
+  "parameters": {
+    "subscriptionId": "12345678-1234-1234-12345678abc",
+    "resourceGroupName": "exampleResourceGroup",
+    "factoryName": "exampleFactoryName-linked",
+    "dataFactoryResourceId": null,
+    "api-version": "2017-09-01-preview"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Date": "Wed, 23 May 2018 02:26:57 GMT",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-ratelimit-remaining-subscription-writes": "1194",
+        "x-ms-request-id": "02033606-cd25-4bc1-9496-e91939965331",
+        "x-ms-correlation-request-id": "02033606-cd25-4bc1-9496-e91939965331"
+      },
+      "body": {
+        "value": [
+          {
+            "id": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationruntimes/exampleIntegrationRuntime",
+            "name": "exampleIntegrationRuntime",
+            "properties": {
+              "type": "SelfHosted",
+              "description": "A selfhosted integration runtime"
+            },
+            "etag": "5f005a9c-0000-0000-0000-5b04d1030000"
+          }
+        ]
+      }
+    }
+  }
+}

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

@@ -7,68 +7,29 @@
     "ifMatch": null,
     "integrationRuntime": {
       "properties": {
-        "type": "Managed",
-        "typeProperties": {
-          "computeProperties": {
-            "location": "West US",
-            "nodeSize": "Standard_D1_v2",
-            "numberOfNodes": 1,
-            "maxParallelExecutionsPerNode": 1
-          },
-          "ssisProperties": {
-            "catalogInfo": {
-              "catalogServerEndpoint": "yandongtestsvr.database.windows.net",
-              "catalogAdminUserName": "yanzhang",
-              "catalogAdminPassword": {
-                "type": "SecureString",
-                "value": "Passw0rd1"
-              },
-              "catalogPricingTier": "S1"
-            },
-            "licenseType": "BasePrice"
-          }
-        },
-        "description": "A managed reserved integration runtime"
+        "type": "SelfHosted",
+        "description": "A selfhosted integration runtime"
       }
     },
     "api-version": "2017-09-01-preview"
   },
   "responses": {
     "200": {
       "headers": {
-        "Date": "Tue, 28 Nov 2017 07:05:28 GMT",
-        "x-ms-request-id": "ef607971-0494-480e-82e7-73df0c671d9e",
-        "X-Content-Type-Options": "nosniff"
+        "Date": "Sun, 27 May 2018 10:01:12 GMT",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-ratelimit-remaining-subscription-writes": "1198",
+        "x-ms-request-id": "e3a50c3d-d098-4d13-b4ba-b6a8a04858b2",
+        "x-ms-correlation-request-id": "e3a50c3d-d098-4d13-b4ba-b6a8a04858b2"
       },
       "body": {
         "id": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationruntimes/exampleIntegrationRuntime",
         "name": "exampleIntegrationRuntime",
         "properties": {
-          "type": "Managed",
-          "typeProperties": {
-            "computeProperties": {
-              "location": "West US",
-              "nodeSize": "Standard_D1_v2",
-              "numberOfNodes": 1,
-              "maxParallelExecutionsPerNode": 1
-            },
-            "ssisProperties": {
-              "catalogInfo": {
-                "catalogServerEndpoint": "yandongtestsvr.database.windows.net",
-                "catalogAdminUserName": "yanzhang",
-                "catalogAdminPassword": {
-                  "type": "SecureString",
-                  "value": "**********"
-                },
-                "catalogPricingTier": "S1"
-              },
-              "licenseType": "BasePrice"
-            }
-          },
-          "description": "A managed reserved integration runtime",
-          "state": "Initial"
+          "type": "SelfHosted",
+          "description": "A selfhosted integration runtime"
         },
-        "etag": "0100333d-0000-0000-0000-5a1d0ab80000"
+        "etag": "00003785-0000-0000-0000-5b0a81e90000"
       }
     }
   }

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

@@ -9,38 +9,20 @@
   "responses": {
     "200": {
       "headers": {
-        "Date": "Tue, 28 Nov 2017 07:05:29 GMT",
-        "x-ms-request-id": "f0c62d3c-0df3-4b08-b860-d258752bdfec",
-        "X-Content-Type-Options": "nosniff"
+        "Date": "Sun, 27 May 2018 10:01:13 GMT",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-ratelimit-remaining-subscription-reads": "14998",
+        "x-ms-request-id": "91f6c539-2302-4717-a99c-c228a5ecb59f",
+        "x-ms-correlation-request-id": "91f6c539-2302-4717-a99c-c228a5ecb59f"
       },
       "body": {
         "id": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationruntimes/exampleIntegrationRuntime",
         "name": "exampleIntegrationRuntime",
         "properties": {
-          "type": "Managed",
-          "typeProperties": {
-            "computeProperties": {
-              "location": "West US",
-              "nodeSize": "Standard_D1_v2",
-              "numberOfNodes": 1,
-              "maxParallelExecutionsPerNode": 1
-            },
-            "ssisProperties": {
-              "catalogInfo": {
-                "catalogServerEndpoint": "yandongtestsvr.database.windows.net",
-                "catalogAdminUserName": "yanzhang",
-                "catalogAdminPassword": {
-                  "type": "SecureString",
-                  "value": "**********"
-                },
-                "catalogPricingTier": "S1"
-              }
-            }
-          },
-          "description": "A managed reserved integration runtime",
-          "state": "Initial"
+          "type": "SelfHosted",
+          "description": "A selfhosted integration runtime"
         },
-        "etag": "0100333d-0000-0000-0000-5a1d0ab80000"
+        "etag": "00003785-0000-0000-0000-5b0a81e90000"
       }
     }
   }

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

@@ -18,8 +18,6 @@
         "properties": {
           "state": "Initial",
           "type": "Managed",
-          "dataFactoryLocation": "West US",
-          "resourceUri": "/subscriptions/12345678-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.DataFactory/factories/exampleFactoryName/integrationruntimes/exampleIntegrationRuntime",
           "typeProperties": {}
         }
       }

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

@@ -0,0 +1,24 @@
+{
+  "parameters": {
+    "subscriptionId": "12345678-1234-1234-12345678abc",
+    "resourceGroupName": "exampleResourceGroup",
+    "factoryName": "exampleFactoryName",
+    "integrationRuntimeName": "exampleIntegrationRuntime",
+    "integrationRuntimePermissionRequest": {
+      "factoryIdentity": "4fe85c30-0f43-41e9-a772-465410992bd4"
+    },
+    "api-version": "2017-09-01-preview"
+  },
+  "responses": {
+    "200": {
+      "headers": {
+        "Date": "Wed, 23 May 2018 02:26:19 GMT",
+        "X-Content-Type-Options": "nosniff",
+        "x-ms-ratelimit-remaining-subscription-writes": "1196",
+        "x-ms-request-id": "ba7a8703-f4c5-4f3c-b706-faf3547091f9",
+        "x-ms-correlation-request-id": "ba7a8703-f4c5-4f3c-b706-faf3547091f9"
+      },
+      "body": null
+    }
+  }
+}