Networking and plumbing enhancements

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java

@@ -302,7 +302,7 @@ interface DefinitionWithNetwork extends DefinitionWithPrimaryNetworkInterface {
          * @param creatable a creatable definition for a new virtual network
          * @return the next stage of the virtual machine definition
          */
-        DefinitionWithPrivateIp withNewPrimaryNetwork(Network.DefinitionCreatable creatable);
+        DefinitionWithPrivateIp withNewPrimaryNetwork(Network.DefinitionStages.WithCreate creatable);
 
         /**
          * Creates a new virtual network to associate with the virtual machine's primary network interface.

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetImpl.java

@@ -25,19 +25,26 @@
  */
 class AvailabilitySetImpl
     extends
-        GroupableResourceImpl<AvailabilitySet, AvailabilitySetInner, AvailabilitySetImpl>
+        GroupableResourceImpl<
+            AvailabilitySet,
+            AvailabilitySetInner,
+            AvailabilitySetImpl,
+            ComputeManager>
     implements
         AvailabilitySet,
         AvailabilitySet.Definitions,
         AvailabilitySet.Update {
+
     private List<String> idOfVMsInSet;
+
     // The client to make AvailabilitySet Management API calls
     private final AvailabilitySetsInner client;
 
     AvailabilitySetImpl(String name, AvailabilitySetInner innerModel,
                                final AvailabilitySetsInner client,
-                               final ResourceManager resourceManager) {
-        super(name, innerModel, resourceManager);
+                               final ResourceManager resourceManager,
+                               final ComputeManager computeManager) {
+        super(name, innerModel, resourceManager, computeManager);
         this.client = client;
     }
 

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java

@@ -25,13 +25,19 @@
  * The implementation for {@link AvailabilitySets}.
  */
 class AvailabilitySetsImpl
-    extends GroupableResourcesImpl<AvailabilitySet, AvailabilitySetImpl, AvailabilitySetInner, AvailabilitySetsInner>
+    extends GroupableResourcesImpl<
+        AvailabilitySet,
+        AvailabilitySetImpl,
+        AvailabilitySetInner,
+        AvailabilitySetsInner,
+        ComputeManager>
     implements AvailabilitySets {
 
     AvailabilitySetsImpl(
             final AvailabilitySetsInner client,
-            final ResourceManager resourceManager) {
-        super(resourceManager, client);
+            final ResourceManager resourceManager,
+            final ComputeManager computeManager) {
+        super(resourceManager, client, computeManager);
     }
 
     @Override
@@ -79,14 +85,16 @@ protected AvailabilitySetImpl wrapModel(String name) {
         return new AvailabilitySetImpl(name,
                 new AvailabilitySetInner(),
                 this.innerCollection,
-                this.resourceManager);
+                this.resourceManager,
+                super.myManager);
     }
 
     @Override
     protected AvailabilitySetImpl wrapModel(AvailabilitySetInner availabilitySetInner) {
         return new AvailabilitySetImpl(availabilitySetInner.name(),
                 availabilitySetInner,
                 this.innerCollection,
-                this.resourceManager);
+                this.resourceManager,
+                this.myManager);
     }
 }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/ComputeManager.java

@@ -16,12 +16,10 @@
 /**
  * Entry point to Azure compute resource management.
  */
-public final class ComputeManager extends Manager<ComputeManager> {
+public final class ComputeManager extends Manager<ComputeManager, ComputeManagementClientImpl> {
     // The service managers
     private StorageManager storageManager;
     private NetworkManager networkManager;
-    // The sdk clients
-    private ComputeManagementClientImpl computeManagementClient;
     // The collections
     private AvailabilitySets availabilitySets;
     private VirtualMachines virtualMachines;
@@ -85,9 +83,10 @@ public ComputeManager authenticate(ServiceClientCredentials credentials, String
     }
 
     private ComputeManager(RestClient restClient, String subscriptionId) {
-        super(restClient, subscriptionId);
-        computeManagementClient = new ComputeManagementClientImpl(restClient);
-        computeManagementClient.withSubscriptionId(subscriptionId);
+        super(
+                restClient,
+                subscriptionId,
+                new ComputeManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
         storageManager = StorageManager.authenticate(restClient, subscriptionId);
         networkManager = NetworkManager.authenticate(restClient, subscriptionId);
     }
@@ -98,8 +97,9 @@ private ComputeManager(RestClient restClient, String subscriptionId) {
     public AvailabilitySets availabilitySets() {
         if (availabilitySets == null) {
             availabilitySets = new AvailabilitySetsImpl(
-                    computeManagementClient.availabilitySets(),
-                    this.resourceManager());
+                    super.innerManagementClient.availabilitySets(),
+                    this.resourceManager(),
+                    this);
         }
         return availabilitySets;
     }
@@ -109,8 +109,8 @@ public AvailabilitySets availabilitySets() {
      */
     public VirtualMachines virtualMachines() {
         if (virtualMachines == null) {
-            virtualMachines = new VirtualMachinesImpl(computeManagementClient.virtualMachines(),
-                    computeManagementClient.virtualMachineSizes(),
+            virtualMachines = new VirtualMachinesImpl(super.innerManagementClient.virtualMachines(),
+                    super.innerManagementClient.virtualMachineSizes(),
                     this,
                     this.resourceManager(),
                     storageManager,
@@ -124,7 +124,7 @@ public VirtualMachines virtualMachines() {
      */
     public VirtualMachineImages virtualMachineImages() {
         if (virtualMachineImages == null) {
-            virtualMachineImages = new VirtualMachineImagesImpl(computeManagementClient.virtualMachineImages());
+            virtualMachineImages = new VirtualMachineImagesImpl(super.innerManagementClient.virtualMachineImages());
         }
         return virtualMachineImages;
     }

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/OfferImpl.java

@@ -12,7 +12,7 @@
 class OfferImpl implements Offer {
     private final Publisher publisher;
     private final String offerName;
-    private final Skus skus;
+    private final SkusImpl skus;
 
     OfferImpl(Publisher publisher, String offer, VirtualMachineImagesInner client) {
         this.publisher = publisher;

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/SkuImpl.java

@@ -12,15 +12,13 @@
  */
 class SkuImpl
         implements Sku {
-    private final VirtualMachineImagesInner client;
     private final Offer offer;
     private final String skuName;
     private final VirtualMachineImagesInSku imagesInSku;
 
     SkuImpl(Offer offer, String skuName, VirtualMachineImagesInner client) {
         this.offer = offer;
         this.skuName = skuName;
-        this.client = client;
         this.imagesInSku = new VirtualMachineImagesInSkuImpl(this, client);
     }
 

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java

@@ -68,14 +68,17 @@
  * The implementation for {@link VirtualMachine} and its create and update interfaces.
  */
 class VirtualMachineImpl
-        extends GroupableResourceImpl<VirtualMachine, VirtualMachineInner, VirtualMachineImpl>
+        extends GroupableResourceImpl<
+            VirtualMachine,
+            VirtualMachineInner,
+            VirtualMachineImpl,
+            ComputeManager>
         implements
         VirtualMachine,
         VirtualMachine.Definitions,
         VirtualMachine.Update {
     // Clients
     private final VirtualMachinesInner client;
-    private final ComputeManager computeManager;
     private final StorageManager storageManager;
     private final NetworkManager networkManager;
     // the name of the virtual machine
@@ -122,9 +125,8 @@ class VirtualMachineImpl
                        final ResourceManager resourceManager,
                        final StorageManager storageManager,
                        final NetworkManager networkManager) {
-        super(name, innerModel, resourceManager);
+        super(name, innerModel, resourceManager, computeManager);
         this.client = client;
-        this.computeManager = computeManager;
         this.storageManager = storageManager;
         this.networkManager = networkManager;
         this.vmName = name;
@@ -234,7 +236,7 @@ public VirtualMachineInstanceView refreshInstanceView() throws CloudException, I
 
     // Fluent methods for defining virtual network association for the new primary network interface
     @Override
-    public VirtualMachineImpl withNewPrimaryNetwork(Network.DefinitionCreatable creatable) {
+    public VirtualMachineImpl withNewPrimaryNetwork(Network.DefinitionStages.WithCreate creatable) {
         this.nicDefinitionWithPrivateIp = this.preparePrimaryNetworkInterface(this.namer.randomName("nic", 20))
                 .withNewPrimaryNetwork(creatable);
         return this;
@@ -618,7 +620,7 @@ public VirtualMachineImpl withNewAvailabilitySet(AvailabilitySet.DefinitionCreat
 
     @Override
     public VirtualMachineImpl withNewAvailabilitySet(String name) {
-        return withNewAvailabilitySet(this.computeManager.availabilitySets().define(name)
+        return withNewAvailabilitySet(super.myManager.availabilitySets().define(name)
                 .withRegion(region())
                 .withExistingGroup(this.resourceGroupName())
         );

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java

@@ -37,9 +37,13 @@
  * The implementation for {@link VirtualMachines}.
  */
 class VirtualMachinesImpl
-        extends GroupableResourcesImpl<VirtualMachine, VirtualMachineImpl, VirtualMachineInner, VirtualMachinesInner>
+        extends GroupableResourcesImpl<
+            VirtualMachine,
+            VirtualMachineImpl,
+            VirtualMachineInner,
+            VirtualMachinesInner,
+            ComputeManager>
         implements VirtualMachines {
-    private final ComputeManager computeManager;
     private final StorageManager storageManager;
     private final NetworkManager networkManager;
     private final VirtualMachineSizesImpl vmSizes;
@@ -50,8 +54,7 @@ class VirtualMachinesImpl
                         ResourceManager resourceManager,
                         StorageManager storageManager,
                         NetworkManager networkManager) {
-        super(resourceManager, client);
-        this.computeManager = computeManager;
+        super(resourceManager, client, computeManager);
         this.storageManager = storageManager;
         this.networkManager = networkManager;
         this.vmSizes = new VirtualMachineSizesImpl(virtualMachineSizesClient);
@@ -155,7 +158,7 @@ protected VirtualMachineImpl wrapModel(String name) {
         return new VirtualMachineImpl(name,
             inner,
             this.innerCollection,
-            this.computeManager,
+            super.myManager,
             this.resourceManager,
             this.storageManager,
             this.networkManager);
@@ -166,7 +169,7 @@ protected VirtualMachineImpl wrapModel(VirtualMachineInner virtualMachineInner)
         return new VirtualMachineImpl(virtualMachineInner.name(),
                 virtualMachineInner,
                 this.innerCollection,
-                this.computeManager,
+                super.myManager,
                 this.resourceManager,
                 this.storageManager,
                 this.networkManager);