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.

Sign up for GitHub

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

Jump to bottom

Add ipConfig to parent inside attach() not in ctr #909

Merged
merged 1 commit into from
Jun 27, 2016
Merged

Add ipConfig to parent inside attach() not in ctr #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ...main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,7 @@ class NetworkInterfaceImpl
initializeNicIpConfigurations();
}

/**************************************************.
* Verbs
**************************************************/
// Verbs

@Override
public NetworkInterface refresh() throws Exception {
Expand All @@ -99,9 +97,7 @@ public ServiceCall applyAsync(ServiceCallback<NetworkInterface> callback) {
return createAsync(callback);
}

/**************************************************.
* Setters
**************************************************/
// Setters (fluent)

@Override
public NetworkInterfaceImpl withNewPrimaryNetwork(Creatable<Network> creatable) {
Expand Down Expand Up @@ -247,9 +243,7 @@ public NetworkInterfaceImpl withInternalDnsNameLabel(String dnsNameLabel) {
return this;
}

/**************************************************.
* Getters
**************************************************/
// Getters

@Override
public boolean isIpForwardingEnabled() {
Expand Down Expand Up @@ -377,8 +371,8 @@ public void failure(Throwable t) {

@Override
public void success(ServiceResponse<Void> result) {
initializeNicIpConfigurations();
clearCachedRelatedResources();
initializeNicIpConfigurations();
callback.success(result);
}
}));
Expand All @@ -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.
Expand Down Expand Up @@ -450,7 +445,6 @@ private NicIpConfigurationImpl prepareNewNicIpConfiguration(String name) {
this,
super.myManager
);
this.nicIpConfigurations.add(nicIpConfiguration);
return nicIpConfiguration;
}

Expand All @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions ...in/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -115,7 +114,7 @@ public String privateIpAllocationMethod() {

@Override
public NetworkInterfaceImpl attach() {
return parent();
return parent().withIpConfiguration(this);
}

@Override
Expand Down