Merge pull request Azure#909 from anuchandy/fixIpconfigAttach

Add ipConfig to parent inside attach() not in ctr
doublek420 · Jun 27, 2016 · 53bd408 · 53bd408
2 parents 0da2078 + 031fedf
commit 53bd408
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/...main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java b/...main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java
@@ -75,9 +75,7 @@ class NetworkInterfaceImpl
         initializeNicIpConfigurations();
     }
 
-    /**************************************************.
-     * Verbs
-     **************************************************/
+    // Verbs
 
     @Override
     public NetworkInterface refresh() throws Exception {
@@ -99,9 +97,7 @@ public ServiceCall applyAsync(ServiceCallback<NetworkInterface> callback) {
         return createAsync(callback);
     }
 
-    /**************************************************.
-     * Setters
-     **************************************************/
+    // Setters (fluent)
 
     @Override
     public NetworkInterfaceImpl withNewPrimaryNetwork(Creatable<Network> creatable) {
@@ -247,9 +243,7 @@ public NetworkInterfaceImpl withInternalDnsNameLabel(String dnsNameLabel) {
         return this;
     }
 
-    /**************************************************.
-     * Getters
-     **************************************************/
+    // Getters
 
     @Override
     public boolean isIpForwardingEnabled() {
@@ -377,8 +371,8 @@ public void failure(Throwable t) {
 
                     @Override
                     public void success(ServiceResponse<Void> result) {
-                        initializeNicIpConfigurations();
                         clearCachedRelatedResources();
+                        initializeNicIpConfigurations();
                         callback.success(result);
                     }
                 }));
@@ -398,6 +392,7 @@ private NicIpConfigurationImpl primaryIpConfiguration() {
 
         if (isInCreateMode()) {
             this.nicPrimaryIpConfiguration = prepareNewNicIpConfiguration("primary-nic-config");
+            withIpConfiguration(this.nicPrimaryIpConfiguration);
         } else {
             // Currently Azure supports only one IP configuration and that is the primary
             // hence we pick the first one here.
@@ -450,7 +445,6 @@ private NicIpConfigurationImpl prepareNewNicIpConfiguration(String name) {
                 this,
                 super.myManager
         );
-        this.nicIpConfigurations.add(nicIpConfiguration);
         return nicIpConfiguration;
     }
 
@@ -461,6 +455,12 @@ private void clearCachedRelatedResources() {
         this.nicPrimaryIpConfiguration = null;
     }
 
+    NetworkInterfaceImpl withIpConfiguration(NicIpConfigurationImpl nicIpConfiguration) {
+        this.nicIpConfigurations.add(nicIpConfiguration);
+        this.inner().ipConfigurations().add(nicIpConfiguration.inner());
+        return this;
+    }
+
     void addToCreatableDependencies(Creatable<?> creatableResource) {
         super.addCreatableDependency(creatableResource);
     }

diff --git a/...in/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java b/...in/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java
@@ -59,7 +59,6 @@ protected static NicIpConfigurationImpl prepareNicIpConfiguration(String name,
                                                                       final NetworkManager networkManager) {
         NetworkInterfaceIPConfiguration ipConfigurationInner = new NetworkInterfaceIPConfiguration();
         ipConfigurationInner.withName(name);
-        parent.inner().ipConfigurations().add(ipConfigurationInner);
         return new NicIpConfigurationImpl(name,
                 ipConfigurationInner,
                 parent,
@@ -115,7 +114,7 @@ public String privateIpAllocationMethod() {
 
     @Override
     public NetworkInterfaceImpl attach() {
-        return parent();
+        return parent().withIpConfiguration(this);
     }
 
     @Override