diff --git a/sdk/resources/mgmt-v2020_06_01/pom.xml b/sdk/resources/mgmt-v2020_06_01/pom.xml
index b2c12a49ca297..bd343debf5c81 100644
--- a/sdk/resources/mgmt-v2020_06_01/pom.xml
+++ b/sdk/resources/mgmt-v2020_06_01/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-resources
1.0.0-beta
diff --git a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/DeploymentProperties.java b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/DeploymentProperties.java
index e81d4f81a11a4..4e53fe6927b66 100644
--- a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/DeploymentProperties.java
+++ b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/DeploymentProperties.java
@@ -73,6 +73,14 @@ public class DeploymentProperties {
@JsonProperty(value = "onErrorDeployment")
private OnErrorDeployment onErrorDeployment;
+ /**
+ * Specifies whether template expressions are evaluated within the scope of
+ * the parent template or nested template. Only applicable to nested
+ * templates. If not specified, default value is outer.
+ */
+ @JsonProperty(value = "expressionEvaluationOptions")
+ private ExpressionEvaluationOptions expressionEvaluationOptions;
+
/**
* Get the template content. You use this element when you want to pass the template syntax directly in the request rather than link to an existing template. It can be a JObject or well-formed JSON string. Use either the templateLink property or the template property, but not both.
*
@@ -213,4 +221,24 @@ public DeploymentProperties withOnErrorDeployment(OnErrorDeployment onErrorDeplo
return this;
}
+ /**
+ * Get specifies whether template expressions are evaluated within the scope of the parent template or nested template. Only applicable to nested templates. If not specified, default value is outer.
+ *
+ * @return the expressionEvaluationOptions value
+ */
+ public ExpressionEvaluationOptions expressionEvaluationOptions() {
+ return this.expressionEvaluationOptions;
+ }
+
+ /**
+ * Set specifies whether template expressions are evaluated within the scope of the parent template or nested template. Only applicable to nested templates. If not specified, default value is outer.
+ *
+ * @param expressionEvaluationOptions the expressionEvaluationOptions value to set
+ * @return the DeploymentProperties object itself.
+ */
+ public DeploymentProperties withExpressionEvaluationOptions(ExpressionEvaluationOptions expressionEvaluationOptions) {
+ this.expressionEvaluationOptions = expressionEvaluationOptions;
+ return this;
+ }
+
}
diff --git a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/ExpressionEvaluationOptions.java b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/ExpressionEvaluationOptions.java
new file mode 100644
index 0000000000000..3dee528a17979
--- /dev/null
+++ b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/ExpressionEvaluationOptions.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.resources.v2020_06_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Specifies whether template expressions are evaluated within the scope of the
+ * parent template or nested template.
+ */
+public class ExpressionEvaluationOptions {
+ /**
+ * The scope to be used for evaluation of parameters, variables and
+ * functions in a nested template. Possible values include: 'NotSpecified',
+ * 'Outer', 'Inner'.
+ */
+ @JsonProperty(value = "scope")
+ private ExpressionEvaluationOptionsScopeType scope;
+
+ /**
+ * Get the scope to be used for evaluation of parameters, variables and functions in a nested template. Possible values include: 'NotSpecified', 'Outer', 'Inner'.
+ *
+ * @return the scope value
+ */
+ public ExpressionEvaluationOptionsScopeType scope() {
+ return this.scope;
+ }
+
+ /**
+ * Set the scope to be used for evaluation of parameters, variables and functions in a nested template. Possible values include: 'NotSpecified', 'Outer', 'Inner'.
+ *
+ * @param scope the scope value to set
+ * @return the ExpressionEvaluationOptions object itself.
+ */
+ public ExpressionEvaluationOptions withScope(ExpressionEvaluationOptionsScopeType scope) {
+ this.scope = scope;
+ return this;
+ }
+
+}
diff --git a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/ExpressionEvaluationOptionsScopeType.java b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/ExpressionEvaluationOptionsScopeType.java
new file mode 100644
index 0000000000000..91b86f81991c9
--- /dev/null
+++ b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/ExpressionEvaluationOptionsScopeType.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.resources.v2020_06_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ExpressionEvaluationOptionsScopeType.
+ */
+public final class ExpressionEvaluationOptionsScopeType extends ExpandableStringEnum {
+ /** Static value NotSpecified for ExpressionEvaluationOptionsScopeType. */
+ public static final ExpressionEvaluationOptionsScopeType NOT_SPECIFIED = fromString("NotSpecified");
+
+ /** Static value Outer for ExpressionEvaluationOptionsScopeType. */
+ public static final ExpressionEvaluationOptionsScopeType OUTER = fromString("Outer");
+
+ /** Static value Inner for ExpressionEvaluationOptionsScopeType. */
+ public static final ExpressionEvaluationOptionsScopeType INNER = fromString("Inner");
+
+ /**
+ * Creates or finds a ExpressionEvaluationOptionsScopeType from its string representation.
+ * @param name a name to look for
+ * @return the corresponding ExpressionEvaluationOptionsScopeType
+ */
+ @JsonCreator
+ public static ExpressionEvaluationOptionsScopeType fromString(String name) {
+ return fromString(name, ExpressionEvaluationOptionsScopeType.class);
+ }
+
+ /**
+ * @return known ExpressionEvaluationOptionsScopeType values
+ */
+ public static Collection values() {
+ return values(ExpressionEvaluationOptionsScopeType.class);
+ }
+}
diff --git a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/Providers.java b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/Providers.java
index e5484426bf115..077f5e44b4a98 100644
--- a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/Providers.java
+++ b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/Providers.java
@@ -9,6 +9,7 @@
package com.microsoft.azure.management.resources.v2020_06_01;
import rx.Observable;
+import rx.Completable;
import com.microsoft.azure.management.resources.v2020_06_01.implementation.ProvidersInner;
import com.microsoft.azure.arm.model.HasInner;
@@ -25,6 +26,16 @@ public interface Providers extends HasInner {
*/
Observable unregisterAsync(String resourceProviderNamespace);
+ /**
+ * Registers a management group with a resource provider.
+ *
+ * @param resourceProviderNamespace The namespace of the resource provider to register.
+ * @param groupId The management group ID.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the observable for the request
+ */
+ Completable registerAtManagementGroupScopeAsync(String resourceProviderNamespace, String groupId);
+
/**
* Registers a subscription with a resource provider.
*
diff --git a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersImpl.java b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersImpl.java
index 5d55e58a58530..4797ee83c7fd1 100644
--- a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersImpl.java
+++ b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersImpl.java
@@ -14,6 +14,7 @@
import rx.Observable;
import rx.functions.Func1;
import com.microsoft.azure.Page;
+import rx.Completable;
import com.microsoft.azure.management.resources.v2020_06_01.Provider;
class ProvidersImpl extends WrapperImpl implements Providers {
@@ -44,6 +45,12 @@ public Provider call(ProviderInner inner) {
});
}
+ @Override
+ public Completable registerAtManagementGroupScopeAsync(String resourceProviderNamespace, String groupId) {
+ ProvidersInner client = this.inner();
+ return client.registerAtManagementGroupScopeAsync(resourceProviderNamespace, groupId).toCompletable();
+ }
+
@Override
public Observable registerAsync(String resourceProviderNamespace) {
ProvidersInner client = this.inner();
diff --git a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersInner.java b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersInner.java
index 34ac56f6a6b86..fc26ff4c43809 100644
--- a/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersInner.java
+++ b/sdk/resources/mgmt-v2020_06_01/src/main/java/com/microsoft/azure/management/resources/v2020_06_01/implementation/ProvidersInner.java
@@ -62,6 +62,10 @@ interface ProvidersService {
@POST("subscriptions/{subscriptionId}/providers/{resourceProviderNamespace}/unregister")
Observable> unregister(@Path("resourceProviderNamespace") String resourceProviderNamespace, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+ @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.resources.v2020_06_01.Providers registerAtManagementGroupScope" })
+ @POST("providers/Microsoft.Management/managementGroups/{groupId}/providers/{resourceProviderNamespace}/register")
+ Observable> registerAtManagementGroupScope(@Path("resourceProviderNamespace") String resourceProviderNamespace, @Path("groupId") String groupId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.resources.v2020_06_01.Providers register" })
@POST("subscriptions/{subscriptionId}/providers/{resourceProviderNamespace}/register")
Observable> register(@Path("resourceProviderNamespace") String resourceProviderNamespace, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@@ -171,6 +175,88 @@ private ServiceResponse unregisterDelegate(Response
.build(response);
}
+ /**
+ * Registers a management group with a resource provider.
+ *
+ * @param resourceProviderNamespace The namespace of the resource provider to register.
+ * @param groupId The management group ID.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @throws CloudException thrown if the request is rejected by server
+ * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
+ */
+ public void registerAtManagementGroupScope(String resourceProviderNamespace, String groupId) {
+ registerAtManagementGroupScopeWithServiceResponseAsync(resourceProviderNamespace, groupId).toBlocking().single().body();
+ }
+
+ /**
+ * Registers a management group with a resource provider.
+ *
+ * @param resourceProviderNamespace The namespace of the resource provider to register.
+ * @param groupId The management group ID.
+ * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceFuture} object
+ */
+ public ServiceFuture registerAtManagementGroupScopeAsync(String resourceProviderNamespace, String groupId, final ServiceCallback serviceCallback) {
+ return ServiceFuture.fromResponse(registerAtManagementGroupScopeWithServiceResponseAsync(resourceProviderNamespace, groupId), serviceCallback);
+ }
+
+ /**
+ * Registers a management group with a resource provider.
+ *
+ * @param resourceProviderNamespace The namespace of the resource provider to register.
+ * @param groupId The management group ID.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceResponse} object if successful.
+ */
+ public Observable registerAtManagementGroupScopeAsync(String resourceProviderNamespace, String groupId) {
+ return registerAtManagementGroupScopeWithServiceResponseAsync(resourceProviderNamespace, groupId).map(new Func1, Void>() {
+ @Override
+ public Void call(ServiceResponse response) {
+ return response.body();
+ }
+ });
+ }
+
+ /**
+ * Registers a management group with a resource provider.
+ *
+ * @param resourceProviderNamespace The namespace of the resource provider to register.
+ * @param groupId The management group ID.
+ * @throws IllegalArgumentException thrown if parameters fail the validation
+ * @return the {@link ServiceResponse} object if successful.
+ */
+ public Observable> registerAtManagementGroupScopeWithServiceResponseAsync(String resourceProviderNamespace, String groupId) {
+ if (resourceProviderNamespace == null) {
+ throw new IllegalArgumentException("Parameter resourceProviderNamespace is required and cannot be null.");
+ }
+ if (groupId == null) {
+ throw new IllegalArgumentException("Parameter groupId is required and cannot be null.");
+ }
+ if (this.client.apiVersion() == null) {
+ throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
+ }
+ return service.registerAtManagementGroupScope(resourceProviderNamespace, groupId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent())
+ .flatMap(new Func1, Observable>>() {
+ @Override
+ public Observable> call(Response response) {
+ try {
+ ServiceResponse clientResponse = registerAtManagementGroupScopeDelegate(response);
+ return Observable.just(clientResponse);
+ } catch (Throwable t) {
+ return Observable.error(t);
+ }
+ }
+ });
+ }
+
+ private ServiceResponse registerAtManagementGroupScopeDelegate(Response response) throws CloudException, IOException, IllegalArgumentException {
+ return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter())
+ .register(200, new TypeToken() { }.getType())
+ .registerError(CloudException.class)
+ .build(response);
+ }
+
/**
* Registers a subscription with a resource provider.
*