From db7a82dad0811c223d02f11ab29090553c631806 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Mon, 16 Nov 2020 17:21:41 -0800
Subject: [PATCH 1/2] Increment package version after release of com.azure
azure-security-keyvault-administration (#17600)
---
eng/jacoco-test-coverage/pom.xml | 2 +-
eng/versioning/version_client.txt | 2 +-
.../azure-security-keyvault-administration/CHANGELOG.md | 3 +++
sdk/keyvault/azure-security-keyvault-administration/pom.xml | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 935dbfdc716e..086b7bea1427 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -199,7 +199,7 @@
com.azure
azure-security-keyvault-administration
- 4.0.0-beta.3
+ 4.0.0-beta.4
com.azure
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 8afac97e5736..afb793ecfc69 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -78,7 +78,7 @@ com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-search-documents;11.1.2;11.2.0-beta.4
com.azure:azure-search-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-security-keyvault-administration;4.0.0-beta.2;4.0.0-beta.3
+com.azure:azure-security-keyvault-administration;4.0.0-beta.3;4.0.0-beta.4
com.azure:azure-security-keyvault-certificates;4.1.2;4.2.0-beta.3
com.azure:azure-security-keyvault-jca;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-security-keyvault-keys;4.2.2;4.3.0-beta.3
diff --git a/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md
index 365d50095f8a..69b843ec7679 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md
@@ -1,5 +1,8 @@
# Release History
+## 4.0.0-beta.4 (Unreleased)
+
+
## 4.0.0-beta.3 (2020-11-12)
### New Features
diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml
index 08045b2acf2c..e50a2ca1937a 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml
@@ -13,7 +13,7 @@
com.azure
azure-security-keyvault-administration
- 4.0.0-beta.3
+ 4.0.0-beta.4
Microsoft Azure client library for KeyVault Administration
This module contains client library for Microsoft Azure KeyVault Administration.
From 96f0e128aafb3a395b230993545bfc89424cbb15 Mon Sep 17 00:00:00 2001
From: SDKAuto
Date: Tue, 17 Nov 2020 01:50:10 +0000
Subject: [PATCH 2/2] CodeGen from PR 11670 in Azure/azure-rest-api-specs Merge
2de3a3adf8634151dac517d8fe86bb91dd3915d5 into
df1ec28808dc7e317337eec602b399c33ac98d9d
---
.../mgmt-v2020_05_01_preview/pom.xml | 4 +-
.../DataBoxEdgeDeviceInner.java | 61 ++++++++++++++++++-
.../implementation/RoleInner.java | 1 -
.../implementation/TriggerInner.java | 2 -
4 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/sdk/databoxedge/mgmt-v2020_05_01_preview/pom.xml b/sdk/databoxedge/mgmt-v2020_05_01_preview/pom.xml
index 1f6539ad54c1..30461144c7bc 100644
--- a/sdk/databoxedge/mgmt-v2020_05_01_preview/pom.xml
+++ b/sdk/databoxedge/mgmt-v2020_05_01_preview/pom.xml
@@ -11,8 +11,8 @@
com.microsoft.azure
azure-arm-parent
- 1.3.2
- ../../parents/azure-arm-parent/pom.xml
+ 1.1.0
+ ../../../pom.management.xml
azure-mgmt-databoxedge
1.0.0-beta
diff --git a/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/DataBoxEdgeDeviceInner.java b/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/DataBoxEdgeDeviceInner.java
index e44e7637c661..d643a204d5f2 100644
--- a/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/DataBoxEdgeDeviceInner.java
+++ b/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/DataBoxEdgeDeviceInner.java
@@ -9,8 +9,6 @@
package com.microsoft.azure.management.databoxedge.v2020_05_01_preview.implementation;
import java.util.Map;
-
-import com.microsoft.azure.Resource;
import com.microsoft.azure.management.databoxedge.v2020_05_01_preview.DataBoxEdgeDeviceStatus;
import com.microsoft.azure.management.databoxedge.v2020_05_01_preview.DeviceType;
import java.util.List;
@@ -23,7 +21,24 @@
* The Data Box Edge/Gateway device.
*/
@JsonFlatten
-public class DataBoxEdgeDeviceInner extends Resource {
+public class DataBoxEdgeDeviceInner extends ARMBaseModel {
+ /**
+ * The location of the device. This is a supported and registered Azure
+ * geographical region (for example, West US, East US, or Southeast Asia).
+ * The geographical region of a device cannot be changed once it is
+ * created, but if an identical geographical region is specified on update,
+ * the request will succeed.
+ */
+ @JsonProperty(value = "location", required = true)
+ private String location;
+
+ /**
+ * The list of tags that describe the device. These tags can be used to
+ * view and group this device (across resource groups).
+ */
+ @JsonProperty(value = "tags")
+ private Map tags;
+
/**
* The SKU type.
*/
@@ -123,6 +138,46 @@ public class DataBoxEdgeDeviceInner extends Resource {
@JsonProperty(value = "properties.nodeCount", access = JsonProperty.Access.WRITE_ONLY)
private Integer nodeCount;
+ /**
+ * Get the location of the device. This is a supported and registered Azure geographical region (for example, West US, East US, or Southeast Asia). The geographical region of a device cannot be changed once it is created, but if an identical geographical region is specified on update, the request will succeed.
+ *
+ * @return the location value
+ */
+ public String location() {
+ return this.location;
+ }
+
+ /**
+ * Set the location of the device. This is a supported and registered Azure geographical region (for example, West US, East US, or Southeast Asia). The geographical region of a device cannot be changed once it is created, but if an identical geographical region is specified on update, the request will succeed.
+ *
+ * @param location the location value to set
+ * @return the DataBoxEdgeDeviceInner object itself.
+ */
+ public DataBoxEdgeDeviceInner withLocation(String location) {
+ this.location = location;
+ return this;
+ }
+
+ /**
+ * Get the list of tags that describe the device. These tags can be used to view and group this device (across resource groups).
+ *
+ * @return the tags value
+ */
+ public Map tags() {
+ return this.tags;
+ }
+
+ /**
+ * Set the list of tags that describe the device. These tags can be used to view and group this device (across resource groups).
+ *
+ * @param tags the tags value to set
+ * @return the DataBoxEdgeDeviceInner object itself.
+ */
+ public DataBoxEdgeDeviceInner withTags(Map tags) {
+ this.tags = tags;
+ return this;
+ }
+
/**
* Get the SKU type.
*
diff --git a/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/RoleInner.java b/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/RoleInner.java
index 4fdd653ec1fe..8bdf91998247 100644
--- a/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/RoleInner.java
+++ b/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/RoleInner.java
@@ -12,7 +12,6 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.microsoft.azure.management.databoxedge.v2020_05_01_preview.ARMBaseModel;
-import com.microsoft.azure.management.databoxedge.v2020_05_01_preview.IoTRole;
/**
* Compute role.
diff --git a/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/TriggerInner.java b/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/TriggerInner.java
index 5032819740f5..117cacc822c7 100644
--- a/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/TriggerInner.java
+++ b/sdk/databoxedge/mgmt-v2020_05_01_preview/src/main/java/com/microsoft/azure/management/databoxedge/v2020_05_01_preview/implementation/TriggerInner.java
@@ -12,8 +12,6 @@
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.microsoft.azure.management.databoxedge.v2020_05_01_preview.ARMBaseModel;
-import com.microsoft.azure.management.databoxedge.v2020_05_01_preview.FileEventTrigger;
-import com.microsoft.azure.management.databoxedge.v2020_05_01_preview.PeriodicTimerEventTrigger;
/**
* Trigger details.