Finding pool by port and name instead of just name.

victor-mendes-eduardo · victor-mendes-eduardo · commit b072d5da1b09 · 2016-12-19T11:08:55.000-02:00
Fixing case when there is more than on pool for each port. (reverted from commit 7062960)
diff --git a/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/resource/GloboNetworkResource.java b/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/resource/GloboNetworkResource.java
@@ -895,10 +895,10 @@ protected LbAlgorithm getBalancingAlgorithm(String methodBal) {
         return lbAlgorithm;
     }
 
-    protected PoolV3 findPoolByPortAndName(Integer port, List<PoolV3> pools, String poolName) {
+    protected PoolV3 findPoolByPort(Integer port, List<PoolV3> pools) {
         if(pools != null) {
             for (PoolV3 pool : pools) {
-                if (port.equals(pool.getDefaultPort()) && pool.getIdentifier().equals(poolName)) {
+                if (port.equals(pool.getDefaultPort())) {
                     return pool;
                 }
             }
@@ -1070,9 +1070,7 @@ protected List<VipPoolMap> savePools(List<Long> poolIds, VipInfoHelper vipInfos,
             if(poolIds != null && !poolIds.isEmpty()){
                 pools = poolAPI.getByIdsV3(poolIds);
             }
-
-            String poolName = buildPoolName(cmd.getRegion(), cmd.getHost(), vipPort, realPort);
-            PoolV3 poolV3 = findPoolByPortAndName(realPort, pools, poolName);
+            PoolV3 poolV3 = findPoolByPort(realPort, pools);
 
             //case when user add or remove real, does not need to update pool settings, only reals
             if (poolV3 != null) {
diff --git a/plugins/network-elements/globonetwork/test/com/globo/globonetwork/cloudstack/resource/GloboNetworkResourceTest.java b/plugins/network-elements/globonetwork/test/com/globo/globonetwork/cloudstack/resource/GloboNetworkResourceTest.java
@@ -196,17 +196,16 @@ public void testGetBalancingAlgorithmGivenInvalid(){
     public void testFindPoolByPort(){
         List<PoolV3> pools = new ArrayList<>();
         PoolV3 pool = new PoolV3();
-        pool.setIdentifier("pool_teste");
         pool.setDefaultPort(80);
         pools.add(pool);
 
-        assertNotNull(_resource.findPoolByPortAndName(80, pools, "pool_teste"));
-        assertNull(_resource.findPoolByPortAndName(81, pools, "pool_teste_2"));
+        assertNotNull(_resource.findPoolByPort(80, pools));
+        assertNull(_resource.findPoolByPort(81, pools));
     }
 
     @Test
     public void testFindPoolByPorGivenNullVip(){
-        assertNull(_resource.findPoolByPortAndName(80, null, "pool_teste"));
+        assertNull(_resource.findPoolByPort(80, null));
     }
 
     private PoolV3 mockPoolSave(Long poolId, Long idReturned, Boolean hasPoolMember, Integer vipPort, Integer port, String ip, String healthCheckType, String healthCheck, String expectedHealthCheck, int maxConn,  String serviceDAction) throws GloboNetworkException {
@@ -798,7 +797,6 @@ public void testSavePoolAddRealToExistingPool() throws GloboNetworkException {
         pool.setDefaultPort(8080);
         pool.setId(12L);
         pool.setMaxconn(0);
-        pool.setIdentifier("ACS_POOL_region_vip.domain.com_80_8080");
 
         List<Long> poolIds = Collections.singletonList(pool.getId());
         Ipv4 ip = new Ipv4();
@@ -823,18 +821,17 @@ public void testSavePoolAddRealToExistingPool() throws GloboNetworkException {
         cmd.setHealthcheckType(build.getHealthCheckType());
         cmd.setExpectedHealthcheck(build.getExpectedHealthCheck());
         cmd.setHealthcheck(build.getHealthCheck());
-        cmd.setRegion("region");
 
         //mock 1 - Pool find by id - v3
-        PoolV3 poolv3GetById = mockPool(12L, "ACS_POOL_region_vip.domain.com_80_8080", 8080, "round-robin", build.getHealthCheckType(), build.getHealthCheck(), build.getExpectedHealthCheck(), "*", 5);
+        PoolV3 poolv3GetById = mockPool(12L, "ACS_POOL_", 8080, "round-robin", build.getHealthCheckType(), build.getHealthCheck(), build.getExpectedHealthCheck(), "*", 5);
         PoolV3.PoolMember poolM = mockPoolMember(200L, 8080, 1L, "10.0.0.1", 1L, "vm-01");
         poolv3GetById.getPoolMembers().add(poolM);
 
         when(_resource._globoNetworkApi.getPoolAPI().getById(12L)).thenReturn(poolv3GetById);
         when(_resource._globoNetworkApi.getPoolAPI().getByIdsV3(Collections.singletonList(12L))).thenReturn(Collections.singletonList(poolv3GetById));
 
         //mock 2 - Pool save pool
-        PoolV3 poolToSave = mockPool(12L, "ACS_POOL_region_vip.domain.com_80_8080", 8080, "round-robin", build.getHealthCheckType(), build.getHealthCheck(), build.getExpectedHealthCheck(), "*", 5);
+        PoolV3 poolToSave = mockPool(12L, "ACS_POOL_", 8080, "round-robin", build.getHealthCheckType(), build.getHealthCheck(), build.getExpectedHealthCheck(), "*", 5);
         PoolV3.PoolMember poolMSaved = mockPoolMember(200L, 8080, 1L, "10.0.0.1", 1L, "vm-01");
         poolToSave.getPoolMembers().add(poolMSaved);
         PoolV3.PoolMember poolM2Saved = mockPoolMember(null, 8080, 2L, "10.0.0.2", 2L, "vm-02");

Original file line number	Diff line number	Diff line change
`@@ -895,10 +895,10 @@ protected LbAlgorithm getBalancingAlgorithm(String methodBal) {`
`895`	`895`	`return lbAlgorithm;`
`896`	`896`	`}`
`897`	`897`
`898`		`- protected PoolV3 findPoolByPortAndName(Integer port, List<PoolV3> pools, String poolName) {`
	`898`	`+ protected PoolV3 findPoolByPort(Integer port, List<PoolV3> pools) {`
`899`	`899`	`if(pools != null) {`
`900`	`900`	`for (PoolV3 pool : pools) {`
`901`		`- if (port.equals(pool.getDefaultPort()) && pool.getIdentifier().equals(poolName)) {`
	`901`	`+ if (port.equals(pool.getDefaultPort())) {`
`902`	`902`	`return pool;`
`903`	`903`	`}`
`904`	`904`	`}`
`@@ -1070,9 +1070,7 @@ protected List<VipPoolMap> savePools(List<Long> poolIds, VipInfoHelper vipInfos,`
`1070`	`1070`	`if(poolIds != null && !poolIds.isEmpty()){`
`1071`	`1071`	`pools = poolAPI.getByIdsV3(poolIds);`
`1072`	`1072`	`}`
`1073`		`-`
`1074`		`- String poolName = buildPoolName(cmd.getRegion(), cmd.getHost(), vipPort, realPort);`
`1075`		`- PoolV3 poolV3 = findPoolByPortAndName(realPort, pools, poolName);`
	`1073`	`+ PoolV3 poolV3 = findPoolByPort(realPort, pools);`
`1076`	`1074`
`1077`	`1075`	`//case when user add or remove real, does not need to update pool settings, only reals`
`1078`	`1076`	`if (poolV3 != null) {`