Skip to content

Commit 052cdd1

Browse files
jianghaolujianghaolu
committed
Merge pull request Azure#570 from vladca/trafficManagerNovGa
Update API version, add MinChildEndpoints for NestedEndpoints
2 parents bbfa13f + fdbe0b5 commit 052cdd1

File tree

8 files changed

+149
-59
lines changed

8 files changed

+149
-59
lines changed

‎resource-management/azure-mgmt-traffic-manager/src/main/java/com/microsoft/azure/management/trafficmanager/EndpointOperations.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.microsoft.azure.management.trafficmanager.models.EndpointUpdateResponse;
3131
import com.microsoft.windowsazure.core.OperationResponse;
3232
import com.microsoft.windowsazure.exception.ServiceException;
33-
3433
import java.io.IOException;
3534
import java.util.concurrent.Future;
3635

‎resource-management/azure-mgmt-traffic-manager/src/main/java/com/microsoft/azure/management/trafficmanager/EndpointOperationsImpl.java

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
import com.microsoft.windowsazure.core.utils.CollectionStringBuilder;
3737
import com.microsoft.windowsazure.exception.ServiceException;
3838
import com.microsoft.windowsazure.tracing.CloudTracing;
39+
import java.io.IOException;
40+
import java.io.InputStream;
41+
import java.io.StringWriter;
42+
import java.net.URLEncoder;
43+
import java.util.ArrayList;
44+
import java.util.HashMap;
45+
import java.util.concurrent.Callable;
46+
import java.util.concurrent.Future;
3947
import org.apache.commons.io.IOUtils;
4048
import org.apache.http.HttpResponse;
4149
import org.apache.http.HttpStatus;
@@ -48,15 +56,6 @@
4856
import org.codehaus.jackson.node.NullNode;
4957
import org.codehaus.jackson.node.ObjectNode;
5058

51-
import java.io.IOException;
52-
import java.io.InputStream;
53-
import java.io.StringWriter;
54-
import java.net.URLEncoder;
55-
import java.util.ArrayList;
56-
import java.util.HashMap;
57-
import java.util.concurrent.Callable;
58-
import java.util.concurrent.Future;
59-
6059
/**
6160
* Operations for managing Traffic Manager endpoints.
6261
*/
@@ -180,7 +179,7 @@ public EndpointCreateOrUpdateResponse createOrUpdate(String resourceGroupName, S
180179
url = url + "/";
181180
url = url + URLEncoder.encode(endpointName, "UTF-8");
182181
ArrayList<String> queryParameters = new ArrayList<String>();
183-
queryParameters.add("api-version=" + "2015-04-28-preview");
182+
queryParameters.add("api-version=" + "2015-11-01");
184183
if (queryParameters.size() > 0) {
185184
url = url + "?" + CollectionStringBuilder.join(queryParameters, "&");
186185
}
@@ -252,6 +251,10 @@ public EndpointCreateOrUpdateResponse createOrUpdate(String resourceGroupName, S
252251
if (parameters.getEndpoint().getProperties().getEndpointMonitorStatus() != null) {
253252
((ObjectNode) propertiesValue).put("endpointMonitorStatus", parameters.getEndpoint().getProperties().getEndpointMonitorStatus());
254253
}
254+
255+
if (parameters.getEndpoint().getProperties().getMinChildEndpoints() != null) {
256+
((ObjectNode) propertiesValue).put("minChildEndpoints", parameters.getEndpoint().getProperties().getMinChildEndpoints());
257+
}
255258
}
256259

257260
StringWriter stringWriter = new StringWriter();
@@ -369,6 +372,13 @@ public EndpointCreateOrUpdateResponse createOrUpdate(String resourceGroupName, S
369372
endpointMonitorStatusInstance = endpointMonitorStatusValue.getTextValue();
370373
propertiesInstance.setEndpointMonitorStatus(endpointMonitorStatusInstance);
371374
}
375+
376+
JsonNode minChildEndpointsValue = propertiesValue2.get("minChildEndpoints");
377+
if (minChildEndpointsValue != null && minChildEndpointsValue instanceof NullNode == false) {
378+
long minChildEndpointsInstance;
379+
minChildEndpointsInstance = minChildEndpointsValue.getLongValue();
380+
propertiesInstance.setMinChildEndpoints(minChildEndpointsInstance);
381+
}
372382
}
373383
}
374384

@@ -476,7 +486,7 @@ public OperationResponse delete(String resourceGroupName, String profileName, St
476486
url = url + "/";
477487
url = url + URLEncoder.encode(endpointName, "UTF-8");
478488
ArrayList<String> queryParameters = new ArrayList<String>();
479-
queryParameters.add("api-version=" + "2015-04-28-preview");
489+
queryParameters.add("api-version=" + "2015-11-01");
480490
if (queryParameters.size() > 0) {
481491
url = url + "?" + CollectionStringBuilder.join(queryParameters, "&");
482492
}
@@ -616,7 +626,7 @@ public EndpointGetResponse get(String resourceGroupName, String profileName, Str
616626
url = url + "/";
617627
url = url + URLEncoder.encode(endpointName, "UTF-8");
618628
ArrayList<String> queryParameters = new ArrayList<String>();
619-
queryParameters.add("api-version=" + "2015-04-28-preview");
629+
queryParameters.add("api-version=" + "2015-11-01");
620630
if (queryParameters.size() > 0) {
621631
url = url + "?" + CollectionStringBuilder.join(queryParameters, "&");
622632
}
@@ -746,6 +756,13 @@ public EndpointGetResponse get(String resourceGroupName, String profileName, Str
746756
endpointMonitorStatusInstance = endpointMonitorStatusValue.getTextValue();
747757
propertiesInstance.setEndpointMonitorStatus(endpointMonitorStatusInstance);
748758
}
759+
760+
JsonNode minChildEndpointsValue = propertiesValue.get("minChildEndpoints");
761+
if (minChildEndpointsValue != null && minChildEndpointsValue instanceof NullNode == false) {
762+
long minChildEndpointsInstance;
763+
minChildEndpointsInstance = minChildEndpointsValue.getLongValue();
764+
propertiesInstance.setMinChildEndpoints(minChildEndpointsInstance);
765+
}
749766
}
750767
}
751768

@@ -864,7 +881,7 @@ public EndpointUpdateResponse update(String resourceGroupName, String profileNam
864881
url = url + "/";
865882
url = url + URLEncoder.encode(endpointName, "UTF-8");
866883
ArrayList<String> queryParameters = new ArrayList<String>();
867-
queryParameters.add("api-version=" + "2015-04-28-preview");
884+
queryParameters.add("api-version=" + "2015-11-01");
868885
if (queryParameters.size() > 0) {
869886
url = url + "?" + CollectionStringBuilder.join(queryParameters, "&");
870887
}
@@ -936,6 +953,10 @@ public EndpointUpdateResponse update(String resourceGroupName, String profileNam
936953
if (parameters.getEndpoint().getProperties().getEndpointMonitorStatus() != null) {
937954
((ObjectNode) propertiesValue).put("endpointMonitorStatus", parameters.getEndpoint().getProperties().getEndpointMonitorStatus());
938955
}
956+
957+
if (parameters.getEndpoint().getProperties().getMinChildEndpoints() != null) {
958+
((ObjectNode) propertiesValue).put("minChildEndpoints", parameters.getEndpoint().getProperties().getMinChildEndpoints());
959+
}
939960
}
940961

941962
StringWriter stringWriter = new StringWriter();
@@ -1053,6 +1074,13 @@ public EndpointUpdateResponse update(String resourceGroupName, String profileNam
10531074
endpointMonitorStatusInstance = endpointMonitorStatusValue.getTextValue();
10541075
propertiesInstance.setEndpointMonitorStatus(endpointMonitorStatusInstance);
10551076
}
1077+
1078+
JsonNode minChildEndpointsValue = propertiesValue2.get("minChildEndpoints");
1079+
if (minChildEndpointsValue != null && minChildEndpointsValue instanceof NullNode == false) {
1080+
long minChildEndpointsInstance;
1081+
minChildEndpointsInstance = minChildEndpointsValue.getLongValue();
1082+
propertiesInstance.setMinChildEndpoints(minChildEndpointsInstance);
1083+
}
10561084
}
10571085
}
10581086

‎resource-management/azure-mgmt-traffic-manager/src/main/java/com/microsoft/azure/management/trafficmanager/ProfileOperations.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.microsoft.azure.management.trafficmanager.models.ProfileUpdateResponse;
3434
import com.microsoft.windowsazure.core.OperationResponse;
3535
import com.microsoft.windowsazure.exception.ServiceException;
36-
3736
import java.io.IOException;
3837
import java.util.concurrent.Future;
3938

0 commit comments

Comments
 (0)