diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/CreateExportJob.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/CreateExportJob.json new file mode 100644 index 000000000000..10b923697803 --- /dev/null +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/CreateExportJob.json @@ -0,0 +1,172 @@ +{ + "parameters": { + "api-version": "2016-11-01", + "subscriptionId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", + "resourceGroupName": "myResourceGroup", + "jobName": "myExportJob", + "body": { + "location": "West US", + "properties": { + "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", + "jobType": "Export", + "returnAddress": { + "recipientName": "Test", + "streetAddress1": "Street1", + "streetAddress2": "street2", + "city": "Redmond", + "stateOrProvince": "wa", + "postalCode": "98007", + "countryOrRegion": "USA", + "phone": "4250000000", + "email": "Test@contoso.com" + }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, + "diagnosticsPath": "waimportexport", + "logLevel": "Verbose", + "backupDriveManifest": true, + "export": { + "blobList": { + "blobPathPrefix": [ + "/" + ] + } + } + } + } + }, + "responses": { + "200": { + "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, + "properties": { + "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", + "jobType": "Export", + "returnAddress": { + "recipientName": "Test", + "streetAddress1": "Street1", + "streetAddress2": "street2", + "city": "Redmond", + "stateOrProvince": "wa", + "postalCode": "98007", + "countryOrRegion": "USA", + "phone": "4250000000", + "email": "Test@contoso.com" + }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, + "shippingInformation": { + "recipientName": "Microsoft Azure Import/Export Service", + "streetAddress1": "2045 Lafayette Street", + "streetAddress2": "", + "city": "Santa Clara", + "stateOrProvince": "CA", + "postalCode": "95050", + "countryOrRegion": "USA", + "phone": "408 0000 0000", + "additionalInformation": "" + }, + "diagnosticsPath": "waimportexport", + "logLevel": "Verbose", + "backupDriveManifest": true, + "cancelRequested": false, + "state": "Creating", + "export": { + "blobList": { + "blobPathPrefix": [ + "/" + ] + } + }, + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" + }, + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/myExportJob", + "name": "myExportJob", + "type": "Microsoft.ImportExport/jobs", + "location": "West US" + } + }, + "201": { + "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, + "properties": { + "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", + "jobType": "Export", + "returnAddress": { + "recipientName": "Test", + "streetAddress1": "Street1", + "streetAddress2": "street2", + "city": "Redmond", + "stateOrProvince": "wa", + "postalCode": "98007", + "countryOrRegion": "USA", + "phone": "4250000000", + "email": "Test@contoso.com" + }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, + "shippingInformation": { + "recipientName": "Microsoft Azure Import/Export Service", + "streetAddress1": "2045 Lafayette Street", + "streetAddress2": "", + "city": "Santa Clara", + "stateOrProvince": "CA", + "postalCode": "95050", + "countryOrRegion": "USA", + "phone": "408 0000 0000", + "additionalInformation": "" + }, + "diagnosticsPath": "waimportexport", + "logLevel": "Verbose", + "backupDriveManifest": true, + "cancelRequested": false, + "state": "Creating", + "export": { + "blobList": { + "blobPathPrefix": [ + "/" + ] + } + }, + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" + }, + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/myExportJob", + "name": "myExportJob", + "type": "Microsoft.ImportExport/jobs", + "location": "West US" + } + } + } +} diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/CreateJob.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/CreateJob.json index 9dea85818798..197bc4f12c16 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/CreateJob.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/CreateJob.json @@ -10,7 +10,7 @@ "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", "jobType": "Import", "returnAddress": { - "recipientName": "Tets", + "recipientName": "Test", "streetAddress1": "Street1", "streetAddress2": "street2", "city": "Redmond", @@ -20,6 +20,10 @@ "phone": "4250000000", "email": "Test@contoso.com" }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, "diagnosticsPath": "waimportexport", "logLevel": "Verbose", "backupDriveManifest": true, @@ -27,9 +31,9 @@ { "driveId": "9CA995BB", "bitLockerKey": "238810-662376-448998-450120-652806-203390-606320-483076", - "manifestFile": "\\DriveManifest.xml", - "manifestHash": "109B21108597EF36D5785F08303F3638", - "driveHeaderHash": "" + "manifestFile": "\\8a0c23f7-14b7-470a-9633-fcd46590a1bc.manifest", + "manifestHash": "4228EC5D8E048CB9B515338C789314BE8D0B2FDBC7C7A0308E1C826242CDE74E", + "driveHeaderHash": "0:1048576:FB6B6ED500D49DA6E0D723C98D42C657F2881CC13357C28DCECA6A524F1292501571A321238540E621AB5BD9C9A32637615919A75593E6CB5C1515DAE341CABF;135266304:143360:C957A189AFC38C4E80731252301EB91427CE55E61448FA3C73C6FDDE70ABBC197947EC8D0249A2C639BB10B95957D5820A4BE8DFBBF76FFFA688AE5CE0D42EC3" } ] } @@ -38,11 +42,19 @@ "responses": { "200": { "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, "properties": { "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", "jobType": "Import", "returnAddress": { - "recipientName": "Tets", + "recipientName": "Test", "streetAddress1": "Street1", "streetAddress2": "street2", "city": "Redmond", @@ -52,6 +64,10 @@ "phone": "4250000000", "email": "Test@contoso.com" }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, "shippingInformation": { "recipientName": "Microsoft Azure Import/Export Service", "streetAddress1": "2045 Lafayette Street", @@ -60,7 +76,8 @@ "stateOrProvince": "CA", "postalCode": "95050", "countryOrRegion": "USA", - "phone": "408 0000 0000" + "phone": "408 0000 0000", + "additionalInformation": "" }, "diagnosticsPath": "waimportexport", "logLevel": "Verbose", @@ -70,13 +87,19 @@ "driveList": [ { "driveId": "9CA995BB", - "manifestFile": "\\DriveManifest.xml", - "manifestHash": "109B21108597EF36D5785F08303F3638", - "driveHeaderHash": "", + "manifestFile": "\\8a0c23f7-14b7-470a-9633-fcd46590a1bc.manifest", + "manifestHash": "4228EC5D8E048CB9B515338C789314BE8D0B2FDBC7C7A0308E1C826242CDE74E", + "driveHeaderHash": "0:1048576:FB6B6ED500D49DA6E0D723C98D42C657F2881CC13357C28DCECA6A524F1292501571A321238540E621AB5BD9C9A32637615919A75593E6CB5C1515DAE341CABF;135266304:143360:C957A189AFC38C4E80731252301EB91427CE55E61448FA3C73C6FDDE70ABBC197947EC8D0249A2C639BB10B95957D5820A4BE8DFBBF76FFFA688AE5CE0D42EC3", "state": "Specified" } ], - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" }, "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/myJob", "name": "myJob", @@ -86,11 +109,19 @@ }, "201": { "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, "properties": { "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", "jobType": "Import", "returnAddress": { - "recipientName": "Tets", + "recipientName": "Test", "streetAddress1": "Street1", "streetAddress2": "street2", "city": "Redmond", @@ -100,6 +131,10 @@ "phone": "4250000000", "email": "Test@contoso.com" }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, "shippingInformation": { "recipientName": "Microsoft Azure Import/Export Service", "streetAddress1": "2045 Lafayette Street", @@ -108,7 +143,8 @@ "stateOrProvince": "CA", "postalCode": "95050", "countryOrRegion": "USA", - "phone": "408 0000 0000" + "phone": "408 0000 0000", + "additionalInformation": "" }, "diagnosticsPath": "waimportexport", "logLevel": "Verbose", @@ -118,13 +154,19 @@ "driveList": [ { "driveId": "9CA995BB", - "manifestFile": "\\DriveManifest.xml", - "manifestHash": "109B21108597EF36D5785F08303F3638", - "driveHeaderHash": "", + "manifestFile": "\\8a0c23f7-14b7-470a-9633-fcd46590a1bc.manifest", + "manifestHash": "4228EC5D8E048CB9B515338C789314BE8D0B2FDBC7C7A0308E1C826242CDE74E", + "driveHeaderHash": "0:1048576:FB6B6ED500D49DA6E0D723C98D42C657F2881CC13357C28DCECA6A524F1292501571A321238540E621AB5BD9C9A32637615919A75593E6CB5C1515DAE341CABF;135266304:143360:C957A189AFC38C4E80731252301EB91427CE55E61448FA3C73C6FDDE70ABBC197947EC8D0249A2C639BB10B95957D5820A4BE8DFBBF76FFFA688AE5CE0D42EC3", "state": "Specified" } ], - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" }, "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/myJob", "name": "myJob", diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/DeleteJob.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/DeleteJob.json index 2b69050a8f49..6ac3183c8b6d 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/DeleteJob.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/DeleteJob.json @@ -6,51 +6,6 @@ "jobName": "myJob" }, "responses": { - "200": { - "properties": { - "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", - "jobType": "Import", - "returnAddress": { - "recipientName": "Tets", - "streetAddress1": "Street1", - "streetAddress2": "street2", - "city": "Redmond", - "stateOrProvince": "wa", - "postalCode": "98007", - "countryOrRegion": "USA", - "phone": "4250000000", - "email": "Test@contoso.com" - }, - "shippingInformation": { - "recipientName": "Microsoft Azure Import/Export Service", - "streetAddress1": "2045 Lafayette Street", - "streetAddress2": "", - "city": "Santa Clara", - "stateOrProvince": "CA", - "postalCode": "95050", - "countryOrRegion": "USA", - "phone": "408 0000 0000" - }, - "diagnosticsPath": "waimportexport", - "logLevel": "Verbose", - "backupDriveManifest": true, - "cancelRequested": false, - "state": "Creating", - "driveList": [ - { - "driveId": "9CA995BB", - "manifestFile": "\\DriveManifest.xml", - "manifestHash": "109B21108597EF36D5785F08303F3638", - "driveHeaderHash": "", - "state": "Specified" - } - ], - "provisioningState": "Succeeded" - }, - "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/test", - "name": "myJob", - "type": "Microsoft.ImportExport/jobs", - "location": "West US" - } + "200": {} } } diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetExportJob.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetExportJob.json new file mode 100644 index 000000000000..b739d81d2893 --- /dev/null +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetExportJob.json @@ -0,0 +1,76 @@ +{ + "parameters": { + "api-version": "2016-11-01", + "subscriptionId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", + "resourceGroupName": "myResourceGroup", + "jobName": "myJob" + }, + "responses": { + "200": { + "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, + "properties": { + "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", + "jobType": "Export", + "returnAddress": { + "recipientName": "Test", + "streetAddress1": "Street1", + "streetAddress2": "street2", + "city": "Redmond", + "stateOrProvince": "wa", + "postalCode": "98007", + "countryOrRegion": "USA", + "phone": "4250000000", + "email": "Test@contoso.com" + }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, + "shippingInformation": { + "recipientName": "Microsoft Azure Import/Export Service", + "streetAddress1": "2045 Lafayette Street", + "streetAddress2": "", + "city": "Santa Clara", + "stateOrProvince": "CA", + "postalCode": "95050", + "countryOrRegion": "USA", + "phone": "408 0000 0000", + "additionalInformation": "" + }, + "diagnosticsPath": "waimportexport", + "logLevel": "Verbose", + "backupDriveManifest": true, + "cancelRequested": false, + "state": "Creating", + "driveList": [], + "export": { + "blobList": { + "blobPathPrefix": [ + "/" + ] + } + }, + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" + }, + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/test", + "name": "myJob", + "type": "Microsoft.ImportExport/jobs", + "location": "West US" + } + } + } +} diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetJob.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetJob.json index f18299e4c3c0..b83260be9466 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetJob.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetJob.json @@ -8,11 +8,19 @@ "responses": { "200": { "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, "properties": { "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", "jobType": "Import", "returnAddress": { - "recipientName": "Tets", + "recipientName": "Test", "streetAddress1": "Street1", "streetAddress2": "street2", "city": "Redmond", @@ -22,6 +30,10 @@ "phone": "4250000000", "email": "Test@contoso.com" }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, "shippingInformation": { "recipientName": "Microsoft Azure Import/Export Service", "streetAddress1": "2045 Lafayette Street", @@ -30,7 +42,8 @@ "stateOrProvince": "CA", "postalCode": "95050", "countryOrRegion": "USA", - "phone": "408 0000 0000" + "phone": "408 0000 0000", + "additionalInformation": "" }, "diagnosticsPath": "waimportexport", "logLevel": "Verbose", @@ -46,7 +59,13 @@ "state": "Specified" } ], - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" }, "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/test", "name": "myJob", diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetLocation.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetLocation.json index 0de2eecc4b23..2ad4eb715848 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetLocation.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/GetLocation.json @@ -15,6 +15,7 @@ "postalCode": "95050", "countryOrRegion": "USA", "phone": "408 352 7600", + "additionalShippingInformation": "", "supportedCarriers": [ "FedEx" ], diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInResourceGroup.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInResourceGroup.json index f6f10d44d4d2..994045e014a5 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInResourceGroup.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInResourceGroup.json @@ -9,6 +9,14 @@ "body": { "value": [ { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, "properties": { "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/xtprodtestwu", "jobType": "Import", @@ -23,6 +31,10 @@ "phone": "4250000000", "email": "test@contoso.com" }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, "shippingInformation": { "recipientName": "Microsoft Azure Import/Export Service", "streetAddress1": "2045 Lafayette Street", @@ -31,7 +43,8 @@ "stateOrProvince": "CA", "postalCode": "95050", "countryOrRegion": "USA", - "phone": "408 352 7600" + "phone": "408 352 7600", + "additionalInformation": "" }, "deliveryPackage": { "carrierName": "FedEx", @@ -44,7 +57,13 @@ "backupDriveManifest": true, "cancelRequested": false, "state": "Received", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" }, "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/test-by1-ssd-2", "name": "test-by1-ssd-2", diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInSubscription.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInSubscription.json index 5f15bc48c88b..23daf2cefda7 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInSubscription.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListJobsInSubscription.json @@ -8,6 +8,14 @@ "body": { "value": [ { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, "properties": { "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.Storage/storageAccounts/xtprodtestarmos2", "jobType": "Import", @@ -22,6 +30,10 @@ "phone": "425000000", "email": "test@contoso.com" }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, "shippingInformation": { "recipientName": "Windows Azure Import Export Service", "streetAddress1": "Boydton 1 / BLDG # 1 101 Herbert Drive", @@ -30,7 +42,8 @@ "stateOrProvince": "VA", "postalCode": "23917", "countryOrRegion": "USA", - "phone": "+1-434-738-9443" + "phone": "+1-434-738-9443", + "additionalInformation": "" }, "deliveryPackage": { "carrierName": "FedEx", @@ -51,7 +64,13 @@ "state": "Received" } ], - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" }, "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.ImportExport/jobs/test-bn1-import-cpu100-01", "name": "test-bn1-import-cpu100-01", @@ -59,6 +78,14 @@ "location": "East US 2" }, { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, "properties": { "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.Storage/storageAccounts/xtprodtestarmos2", "jobType": "Import", @@ -81,7 +108,8 @@ "stateOrProvince": "VA", "postalCode": "23917", "countryOrRegion": "USA", - "phone": "+1-434-738-9443" + "phone": "+1-434-738-9443", + "additionalInformation": "" }, "deliveryPackage": { "carrierName": "FedEx", @@ -107,7 +135,13 @@ "manifestUri": "https://foo.blob.core.windows.net/waimportexport/waies/test-bn1-import-cpu100-02_KV6H86XP_20170813-194620-574_manifest.xml" } ], - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" }, "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.ImportExport/jobs/test-bn1-import-cpu100-02", "name": "test-bn1-import-cpu100-02", diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListLocations.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListLocations.json index eaf8de53c26a..572301b908db 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListLocations.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/ListLocations.json @@ -16,6 +16,7 @@ "postalCode": "2113", "countryOrRegion": "Australia", "phone": "612 0000 0000", + "additionalShippingInformation": "", "supportedCarriers": [ "DHL" ], @@ -37,6 +38,7 @@ "postalCode": "3207", "countryOrRegion": "Australia", "phone": "61 0 0000 0000", + "additionalShippingInformation": "", "supportedCarriers": [ "DHL" ], diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/UpdateExportJob.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/UpdateExportJob.json new file mode 100644 index 000000000000..e43e40ae6224 --- /dev/null +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/UpdateExportJob.json @@ -0,0 +1,82 @@ +{ + "parameters": { + "api-version": "2016-11-01", + "subscriptionId": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", + "resourceGroupName": "myResourceGroup", + "jobName": "myExportJob", + "body": { + "properties": { + "state": "", + "logLevel": "Verbose", + "backupDriveManifest": true + } + } + }, + "responses": { + "200": { + "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, + "properties": { + "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", + "jobType": "Export", + "returnAddress": { + "recipientName": "Test", + "streetAddress1": "Street1", + "streetAddress2": "street2", + "city": "Redmond", + "stateOrProvince": "wa", + "postalCode": "98007", + "countryOrRegion": "USA", + "phone": "4250000000", + "email": "Test@contoso.com" + }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, + "shippingInformation": { + "recipientName": "Microsoft Azure Import/Export Service", + "streetAddress1": "2045 Lafayette Street", + "streetAddress2": "", + "city": "Santa Clara", + "stateOrProvince": "CA", + "postalCode": "95050", + "countryOrRegion": "USA", + "phone": "408 352 7600", + "additionalInformation": "" + }, + "diagnosticsPath": "waimportexport", + "logLevel": "Verbose", + "backupDriveManifest": true, + "cancelRequested": false, + "state": "Creating", + "export": { + "blobList": { + "blobPathPrefix": [ + "/" + ] + } + }, + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" + }, + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/myExportJob", + "name": "myExportJob", + "type": "Microsoft.ImportExport/jobs", + "location": "West US" + } + } + } +} diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/UpdateJob.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/UpdateJob.json index 2b930e957008..f3f2e764d661 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/UpdateJob.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/examples/UpdateJob.json @@ -15,11 +15,19 @@ "responses": { "200": { "body": { + "systemData": { + "createdBy": "string", + "createdByType": "User", + "createdAt": "2020-02-03T01:01:01.1075056Z", + "lastModifiedBy": "string", + "lastModifiedByType": "User", + "lastModifiedAt": "2020-02-04T02:03:01.1974346Z" + }, "properties": { "storageAccountId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ClassicStorage/storageAccounts/test", "jobType": "Import", "returnAddress": { - "recipientName": "Tets", + "recipientName": "Test", "streetAddress1": "Street1", "streetAddress2": "street2", "city": "Redmond", @@ -29,6 +37,10 @@ "phone": "4250000000", "email": "Test@contoso.com" }, + "returnShipping": { + "carrierName": "FedEx", + "carrierAccountNumber": "989ffff" + }, "shippingInformation": { "recipientName": "Microsoft Azure Import/Export Service", "streetAddress1": "2045 Lafayette Street", @@ -37,7 +49,8 @@ "stateOrProvince": "CA", "postalCode": "95050", "countryOrRegion": "USA", - "phone": "408 352 7600" + "phone": "408 352 7600", + "additionalInformation": "" }, "diagnosticsPath": "waimportexport", "logLevel": "Verbose", @@ -47,13 +60,19 @@ "driveList": [ { "driveId": "9CA995BB", - "manifestFile": "\\DriveManifest.xml", - "manifestHash": "109B21108597EF36D5785F08303F3638", - "driveHeaderHash": "", + "manifestFile": "\\8a0c23f7-14b7-470a-9633-fcd46590a1bc.manifest", + "manifestHash": "4228EC5D8E048CB9B515338C789314BE8D0B2FDBC7C7A0308E1C826242CDE74E", + "driveHeaderHash": "0:1048576:FB6B6ED500D49DA6E0D723C98D42C657F2881CC13357C28DCECA6A524F1292501571A321238540E621AB5BD9C9A32637615919A75593E6CB5C1515DAE341CABF;135266304:143360:C957A189AFC38C4E80731252301EB91427CE55E61448FA3C73C6FDDE70ABBC197947EC8D0249A2C639BB10B95957D5820A4BE8DFBBF76FFFA688AE5CE0D42EC3", "state": "Specified" } ], - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryptionKey": { + "kekType": "MicrosoftManaged" + } + }, + "identity": { + "type": "None" }, "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ImportExport/jobs/myJob", "name": "myJob", diff --git a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/storageimportexport.json b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/storageimportexport.json index b7c2b8284486..7e72860e59ae 100644 --- a/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/storageimportexport.json +++ b/specification/storageimportexport/resource-manager/Microsoft.ImportExport/stable/2016-11-01/storageimportexport.json @@ -143,7 +143,8 @@ "in": "query", "description": "An integer value that specifies how many jobs at most should be returned. The value cannot exceed 100.", "required": false, - "type": "integer" + "type": "integer", + "format": "int32" }, { "name": "$filter", @@ -202,7 +203,8 @@ "in": "query", "description": "An integer value that specifies how many jobs at most should be returned. The value cannot exceed 100.", "required": false, - "type": "integer" + "type": "integer", + "format": "int32" }, { "name": "$filter", @@ -251,8 +253,11 @@ "operationId": "Jobs_Get", "description": "Gets information about an existing job.", "x-ms-examples": { - "Get job": { + "Get import job": { "$ref": "examples/GetJob.json" + }, + "Get export job": { + "$ref": "examples/GetExportJob.json" } }, "externalDocs": { @@ -301,8 +306,11 @@ "operationId": "Jobs_Update", "description": "Updates specific properties of a job. You can call this operation to notify the Import/Export service that the hard drives comprising the import or export job have been shipped to the Microsoft data center. It can also be used to cancel an existing job.", "x-ms-examples": { - "Update job": { + "Update import job": { "$ref": "examples/UpdateJob.json" + }, + "Update export job": { + "$ref": "examples/UpdateExportJob.json" } }, "externalDocs": { @@ -360,8 +368,11 @@ "operationId": "Jobs_Create", "description": "Creates a new job or updates an existing job in the specified subscription.", "x-ms-examples": { - "Create job": { + "Create import job": { "$ref": "examples/CreateJob.json" + }, + "Create export job": { + "$ref": "examples/CreateExportJob.json" } }, "externalDocs": { @@ -657,7 +668,7 @@ }, "deliveryPackage": { "description": "Contains information about the package being shipped by the customer to the Microsoft data center. ", - "$ref": "#/definitions/PackageInfomation" + "$ref": "#/definitions/DeliveryPackageInformation" }, "returnPackage": { "description": "Contains information about the package being shipped from the Microsoft data center to the customer to return the drives. The format is the same as the deliveryPackage property above. This property is not included if the drives have not yet been returned. ", @@ -685,6 +696,7 @@ }, "percentComplete": { "type": "integer", + "format": "int32", "description": "Overall percentage completed for the job." }, "incompleteBlobListUri": { @@ -705,6 +717,65 @@ "provisioningState": { "type": "string", "description": "Specifies the provisioning state of the job." + }, + "encryptionKey": { + "description": "Contains information about the encryption key.", + "$ref": "#/definitions/EncryptionKeyDetails" + } + } + }, + "EncryptionKeyDetails": { + "description": "Specifies the encryption key properties", + "properties": { + "kekType": { + "type": "string", + "description": "The type of kek encryption key", + "default": "MicrosoftManaged", + "enum": [ + "MicrosoftManaged", + "CustomerManaged" + ], + "x-ms-enum": { + "name": "EncryptionKekType", + "modelAsString": true + } + }, + "kekUrl": { + "description": "Specifies the url for kek encryption key. ", + "type": "string" + }, + "kekVaultResourceID": { + "description": "Specifies the keyvault resource id for kek encryption key. ", + "type": "string" + } + } + }, + "IdentityDetails": { + "description": "Specifies the identity properties. ", + "properties": { + "type": { + "type": "string", + "description": "The type of identity", + "default": "None", + "enum": [ + "None", + "SystemAssigned", + "UserAssigned" + ], + "x-ms-enum": { + "name": "IdentityType", + "modelAsString": true + } + }, + "principalId": { + "description": "Specifies the principal id for the identity for the job. ", + "type": "string", + "readOnly": true + }, + "tenantId": { + "description": "Specifies the tenant id for the identity for the job. ", + "type": "string", + "readOnly": true } } }, @@ -736,7 +807,7 @@ }, "deliveryPackage": { "description": "Contains information about the package being shipped by the customer to the Microsoft data center.", - "$ref": "#/definitions/PackageInfomation" + "$ref": "#/definitions/DeliveryPackageInformation" }, "logLevel": { "type": "string", @@ -778,6 +849,11 @@ "x-ms-azure-resource": true, "description": "Contains the job information.", "properties": { + "systemData": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData", + "description": "SystemData of ImportExport Jobs.", + "readOnly": true + }, "id": { "type": "string", "description": "Specifies the resource identifier of the job.", @@ -804,6 +880,10 @@ "properties": { "$ref": "#/definitions/JobDetails", "description": "Specifies the job properties" + }, + "identity": { + "$ref": "#/definitions/IdentityDetails", + "description": "Specifies the job identity details" } } }, @@ -893,6 +973,10 @@ "description": "The phone number for the Azure data center. ", "type": "string" }, + "additionalShippingInformation": { + "description": "Additional shipping information for customer, specific to datacenter to which customer should send their disks.", + "type": "string" + }, "supportedCarriers": { "type": "array", "description": "A list of carriers that are supported at this location. ", @@ -980,14 +1064,6 @@ }, "ShippingInformation": { "description": "Contains information about the Microsoft datacenter to which the drives should be shipped.", - "required": [ - "recipientName", - "streetAddress1", - "city", - "stateOrProvince", - "postalCode", - "countryOrRegion" - ], "properties": { "recipientName": { "type": "string", @@ -1020,6 +1096,11 @@ "phone": { "type": "string", "description": "Phone number of the recipient of the returned drives." + }, + "additionalInformation": { + "type": "string", + "description": "Additional shipping information for customer, specific to datacenter to which customer should send their disks.", + "readOnly": true } } }, @@ -1042,6 +1123,33 @@ }, "driveCount": { "type": "integer", + "format": "int32", + "description": "The number of drives included in the package." + }, + "shipDate": { + "type": "string", + "description": "The date when the package is shipped." + } + } + }, + "DeliveryPackageInformation": { + "description": "Contains information about the delivery package being shipped by the customer to the Microsoft data center.", + "required": [ + "carrierName", + "trackingNumber" + ], + "properties": { + "carrierName": { + "type": "string", + "description": "The name of the carrier that is used to ship the import or export drives." + }, + "trackingNumber": { + "type": "string", + "description": "The tracking number of the package." + }, + "driveCount": { + "type": "integer", + "format": "int64", "description": "The number of drives included in the package." }, "shipDate": { @@ -1096,6 +1204,7 @@ }, "percentComplete": { "type": "integer", + "format": "int64", "description": "Percentage completed for the drive. " }, "verboseLogUri": { @@ -1140,7 +1249,7 @@ } } }, - "blobListblobPath": { + "blobListBlobPath": { "type": "string", "description": "The relative URI to the block blob that contains the list of blob paths or blob path prefixes as defined above, beginning with the container name. If the blob is in root container, the URI must begin with $root. " }