Merge branch '2.x'

Author: twoseat

integration-test/src/test/java/org/cloudfoundry/networking/v1/PoliciesTest.java

@@ -57,7 +57,8 @@ public final class PoliciesTest extends AbstractIntegrationTest {
     public void create() {
         String destinationApplicationName = this.nameFactory.getApplicationName();
         String sourceApplicationName = this.nameFactory.getApplicationName();
-        Integer port = this.nameFactory.getPort();
+        Integer startPort = this.nameFactory.getPort();
+        Integer endPort = this.nameFactory.getPort();
 
         this.spaceId
             .flatMapMany(spaceId -> Mono.zip(
@@ -70,8 +71,8 @@ public void create() {
                         .destination(Destination.builder()
                             .id(destinationApplicationId)
                             .ports(Ports.builder()
-                                .end(port + 1)
-                                .start(port)
+                                .end(endPort)
+                                .start(startPort)
                                 .build())
                             .protocol("tcp")
                             .build())
@@ -87,7 +88,7 @@ public void create() {
                 .single())
             .map(policy -> policy.getDestination().getPorts().getStart())
             .as(StepVerifier::create)
-            .expectNext(port)
+            .expectNext(startPort)
             .expectComplete()
             .verify(Duration.ofMinutes(5));
     }

integration-test/src/test/java/org/cloudfoundry/operations/RoutesTest.java

@@ -139,7 +139,7 @@ public void create() {
     @Test
     public void createRouteTcpAssignedPort() {
         String domainName = this.nameFactory.getDomainName();
-        Integer port = 61002;
+        Integer port = this.nameFactory.getPort();
 
         requestCreateSharedDomain(this.cloudFoundryOperations, domainName, DEFAULT_ROUTER_GROUP)
             .then(requestCreateRoute(this.cloudFoundryOperations, this.spaceName, domainName, port))