Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR] network/resource-manager #2135

Merged
merged 1 commit into from
Nov 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
latest network
  • Loading branch information
jianghaolu committed Nov 6, 2018
commit c93542a2a98e7eeeb33939e4407683bd9f520344
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import com.microsoft.azure.arm.resources.collection.SupportsGettingByResourceGroup;
import rx.Observable;
import com.microsoft.azure.arm.resources.collection.SupportsListingByResourceGroup;
import rx.Completable;
import com.microsoft.azure.management.network.v2017_10_01.implementation.VirtualNetworkGatewaysInner;
import com.microsoft.azure.arm.model.HasInner;
import com.microsoft.azure.management.network.v2017_10_01.VirtualNetworkGatewayConnectionListEntity;
Expand Down Expand Up @@ -42,7 +41,7 @@ public interface VirtualNetworkGateways extends SupportsCreating<VirtualNetworkG
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters);
Observable<String> generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters);

/**
* Generates VPN profile for P2S client of the virtual network gateway in the specified resource group. Used for IKEV2 and radius based authentication.
Expand All @@ -53,7 +52,7 @@ public interface VirtualNetworkGateways extends SupportsCreating<VirtualNetworkG
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters);
Observable<String> generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters);

/**
* Gets pre-generated VPN profile for P2S client of the virtual network gateway in the specified resource group. The profile needs to be generated first using generateVpnProfile.
Expand All @@ -63,7 +62,7 @@ public interface VirtualNetworkGateways extends SupportsCreating<VirtualNetworkG
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName);
Observable<String> getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName);

/**
* The GetBgpPeerStatus operation retrieves the status of all BGP peers.
Expand All @@ -83,7 +82,7 @@ public interface VirtualNetworkGateways extends SupportsCreating<VirtualNetworkG
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName);
Observable<String> supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName);

/**
* This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from BGP peers.
Expand Down Expand Up @@ -125,6 +124,6 @@ public interface VirtualNetworkGateways extends SupportsCreating<VirtualNetworkG
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters);
Observable<String> vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters);

}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class BackendAddressPoolImpl extends IndexableRefreshableWrapperImpl<BackendAddr
BackendAddressPoolImpl(BackendAddressPoolInner inner, NetworkManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
this.backendAddressPoolName = IdParsingUtils.getValueFromIdByName(inner.id(), "backendAddressPools");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ConnectionMonitorResultImpl extends CreatableUpdatableImpl<ConnectionMonit
this.manager = manager;
// Set resource name
this.connectionMonitorName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.networkWatcherName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkWatchers");
this.connectionMonitorName = IdParsingUtils.getValueFromIdByName(inner.id(), "connectionMonitors");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ExpressRouteCircuitAuthorizationImpl extends CreatableUpdatableImpl<Expres
this.manager = manager;
// Set resource name
this.authorizationName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.circuitName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteCircuits");
this.authorizationName = IdParsingUtils.getValueFromIdByName(inner.id(), "authorizations");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ExpressRouteCircuitPeeringImpl extends CreatableUpdatableImpl<ExpressRoute
this.manager = manager;
// Set resource name
this.peeringName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.circuitName = IdParsingUtils.getValueFromIdByName(inner.id(), "expressRouteCircuits");
this.peeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "peerings");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class FrontendIPConfigurationImpl extends IndexableRefreshableWrapperImpl<Fronte
FrontendIPConfigurationImpl(FrontendIPConfigurationInner inner, NetworkManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
this.frontendIPConfigurationName = IdParsingUtils.getValueFromIdByName(inner.id(), "frontendIPConfigurations");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class InboundNatRuleImpl extends CreatableUpdatableImpl<InboundNatRule, InboundN
this.manager = manager;
// Set resource name
this.inboundNatRuleName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
this.inboundNatRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "inboundNatRules");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class LoadBalancingRuleImpl extends IndexableRefreshableWrapperImpl<LoadBalancin
LoadBalancingRuleImpl(LoadBalancingRuleInner inner, NetworkManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
this.loadBalancingRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancingRules");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class NetworkInterfaceNetworkInterfaceIPConfigurationImpl extends IndexableRefre
NetworkInterfaceNetworkInterfaceIPConfigurationImpl(NetworkInterfaceIPConfigurationInner inner, NetworkManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.networkInterfaceName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkInterfaces");
this.ipConfigurationName = IdParsingUtils.getValueFromIdByName(inner.id(), "ipConfigurations");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class NetworkSecurityGroupSecurityRuleImpl extends CreatableUpdatableImpl<Networ
this.manager = manager;
// Set resource name
this.securityRuleName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.networkSecurityGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkSecurityGroups");
this.securityRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "securityRules");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class NetworkSecurityGroupSecurityRuleModelImpl extends IndexableRefreshableWrap
NetworkSecurityGroupSecurityRuleModelImpl(SecurityRuleInner inner, NetworkManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.networkSecurityGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkSecurityGroups");
this.defaultSecurityRuleName = IdParsingUtils.getValueFromIdByName(inner.id(), "defaultSecurityRules");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class PacketCaptureResultImpl extends CreatableUpdatableImpl<PacketCaptureResult
this.manager = manager;
// Set resource name
this.packetCaptureName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.networkWatcherName = IdParsingUtils.getValueFromIdByName(inner.id(), "networkWatchers");
this.packetCaptureName = IdParsingUtils.getValueFromIdByName(inner.id(), "packetCaptures");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
import retrofit2.Response;
import rx.functions.Func1;
import rx.Observable;
import com.microsoft.azure.LongRunningFinalState;
import com.microsoft.azure.LongRunningOperationOptions;
import com.microsoft.azure.LongRunningFinalState;
import com.microsoft.azure.LongRunningOperationOptions;

/**
* An instance of this class provides access to all the operations defined
Expand Down Expand Up @@ -770,7 +774,7 @@ public Observable<ServiceResponse<PacketCaptureQueryStatusResultInner>> getStatu
}
final String apiVersion = "2017-10-01";
Observable<Response<ResponseBody>> observable = service.getStatus(resourceGroupName, networkWatcherName, packetCaptureName, this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent());
return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken<PacketCaptureQueryStatusResultInner>() { }.getType());
return client.getAzureClient().getPostOrDeleteResultAsync(observable, new LongRunningOperationOptions().withFinalStateVia(LongRunningFinalState.LOCATION), new TypeToken<PacketCaptureQueryStatusResultInner>() { }.getType());
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class ProbeImpl extends IndexableRefreshableWrapperImpl<Probe, ProbeInner> imple
ProbeImpl(ProbeInner inner, NetworkManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.loadBalancerName = IdParsingUtils.getValueFromIdByName(inner.id(), "loadBalancers");
this.probeName = IdParsingUtils.getValueFromIdByName(inner.id(), "probes");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class RouteFilterRuleImpl extends CreatableUpdatableImpl<RouteFilterRule, RouteF
this.manager = manager;
// Set resource name
this.ruleName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.routeFilterName = IdParsingUtils.getValueFromIdByName(inner.id(), "routeFilters");
this.ruleName = IdParsingUtils.getValueFromIdByName(inner.id(), "routeFilterRules");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class RouteImpl extends CreatableUpdatableImpl<Route, RouteInner, RouteImpl> imp
this.manager = manager;
// Set resource name
this.routeName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.routeTableName = IdParsingUtils.getValueFromIdByName(inner.id(), "routeTables");
this.routeName = IdParsingUtils.getValueFromIdByName(inner.id(), "routes");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class SubnetImpl extends CreatableUpdatableImpl<Subnet, SubnetInner, SubnetImpl>
this.manager = manager;
// Set resource name
this.subnetName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.virtualNetworkName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualNetworks");
this.subnetName = IdParsingUtils.getValueFromIdByName(inner.id(), "subnets");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl extends Indexabl
VirtualMachineScaleSetNetworkInterfaceIPConfigurationImpl(NetworkInterfaceIPConfigurationInner inner, NetworkManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.virtualMachineScaleSetName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualMachineScaleSets");
this.virtualmachineIndex = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualMachines");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,22 +119,22 @@ public VirtualNetworkGateway call(VirtualNetworkGatewayInner inner) {
}

@Override
public Completable generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
public Observable<String> generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
VirtualNetworkGatewaysInner client = this.inner();
return client.generatevpnclientpackageAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toCompletable();
}
return client.generatevpnclientpackageAsync(resourceGroupName, virtualNetworkGatewayName, parameters)
;}

@Override
public Completable generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
public Observable<String> generateVpnProfileAsync(String resourceGroupName, String virtualNetworkGatewayName, VpnClientParameters parameters) {
VirtualNetworkGatewaysInner client = this.inner();
return client.generateVpnProfileAsync(resourceGroupName, virtualNetworkGatewayName, parameters).toCompletable();
}
return client.generateVpnProfileAsync(resourceGroupName, virtualNetworkGatewayName, parameters)
;}

@Override
public Completable getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName) {
public Observable<String> getVpnProfilePackageUrlAsync(String resourceGroupName, String virtualNetworkGatewayName) {
VirtualNetworkGatewaysInner client = this.inner();
return client.getVpnProfilePackageUrlAsync(resourceGroupName, virtualNetworkGatewayName).toCompletable();
}
return client.getVpnProfilePackageUrlAsync(resourceGroupName, virtualNetworkGatewayName)
;}

@Override
public Observable<BgpPeerStatusListResult> getBgpPeerStatusAsync(String resourceGroupName, String virtualNetworkGatewayName) {
Expand All @@ -149,10 +149,10 @@ public BgpPeerStatusListResult call(BgpPeerStatusListResultInner inner) {
}

@Override
public Completable supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
public Observable<String> supportedVpnDevicesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
VirtualNetworkGatewaysInner client = this.inner();
return client.supportedVpnDevicesAsync(resourceGroupName, virtualNetworkGatewayName).toCompletable();
}
return client.supportedVpnDevicesAsync(resourceGroupName, virtualNetworkGatewayName)
;}

@Override
public Observable<GatewayRouteListResult> getLearnedRoutesAsync(String resourceGroupName, String virtualNetworkGatewayName) {
Expand Down Expand Up @@ -211,9 +211,9 @@ public VirtualNetworkGatewayConnectionListEntity call(VirtualNetworkGatewayConne
}

@Override
public Completable vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters) {
public Observable<String> vpnDeviceConfigurationScriptAsync(String resourceGroupName, String virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters) {
VirtualNetworkGatewaysInner client = this.inner();
return client.vpnDeviceConfigurationScriptAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters).toCompletable();
}
return client.vpnDeviceConfigurationScriptAsync(resourceGroupName, virtualNetworkGatewayConnectionName, parameters)
;}

}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class VirtualNetworkPeeringImpl extends CreatableUpdatableImpl<VirtualNetworkPee
this.manager = manager;
// Set resource name
this.virtualNetworkPeeringName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourceGroups");
this.virtualNetworkName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualNetworks");
this.virtualNetworkPeeringName = IdParsingUtils.getValueFromIdByName(inner.id(), "virtualNetworkPeerings");
Expand Down
Loading