Repository: stratos Updated Branches: refs/heads/master be922cc6a -> 91b991909
Fixing typos Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/91b99190 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/91b99190 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/91b99190 Branch: refs/heads/master Commit: 91b991909eb91bc2e826b011b36f4cf84c6f273b Parents: be922cc Author: yutaono <[email protected]> Authored: Sat Oct 31 19:53:19 2015 +0900 Committer: Akila Perera <[email protected]> Committed: Tue Nov 3 17:10:02 2015 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/domain/FloatingNetwork.java | 4 ++-- .../iaases/openstack/networking/NeutronNetworkingApi.java | 8 ++++---- .../openstack/networking/NeutronNetworkingApiTest.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/91b99190/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java index 1d047fe..2945cce 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/FloatingNetwork.java @@ -37,10 +37,10 @@ public class FloatingNetwork implements Serializable { public FloatingNetwork() { } - public FloatingNetwork(String name, String networkUuid, String flotingIP) { + public FloatingNetwork(String name, String networkUuid, String floatingIP) { this.name = name; this.networkUuid = networkUuid; - this.floatingIP = flotingIP; + this.floatingIP = floatingIP; } public String getName() { http://git-wip-us.apache.org/repos/asf/stratos/blob/91b99190/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java index 1a90386..cad6fe6 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApi.java @@ -86,7 +86,7 @@ public class NeutronNetworkingApi implements OpenstackNetworkingApi { getFixedIPToFloatingNetworksMap(iaasProvider.getNetworkInterfaces()); // list of IPs allocated to this node - List<String> associatedFlotingIPs = new ArrayList<String>(); + List<String> associatedFloatingIPs = new ArrayList<String>(); // wait until node gets private IPs while (node.getPrivateAddresses() == null) { @@ -145,10 +145,10 @@ public class NeutronNetworkingApi implements OpenstackNetworkingApi { + "Please check whether the floating network %s can be reached from the fixed IP range", floatingNetwork.getNetworkUuid()); assertNotNullAndNotEmpty(allocatedFloatingIP.getFloatingIpAddress(), allocatedFloatingIPAddressNullOrEmptyMsg); - associatedFlotingIPs.add(allocatedFloatingIP.getFloatingIpAddress()); + associatedFloatingIPs.add(allocatedFloatingIP.getFloatingIpAddress()); } } - return associatedFlotingIPs; + return associatedFloatingIPs; } @Override @@ -391,7 +391,7 @@ public class NeutronNetworkingApi implements OpenstackNetworkingApi { throw new CloudControllerException(msg, e); } - String msg = String.format("Unable to create a floting IP from network %s", floatingNetworkUuid); + String msg = String.format("Unable to create a floating IP from network %s", floatingNetworkUuid); assertNotNull(floatingIP, msg); return floatingIP; http://git-wip-us.apache.org/repos/asf/stratos/blob/91b99190/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java index 61822ef..1a3486b 100644 --- a/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java +++ b/components/org.apache.stratos.cloud.controller/src/test/java/org/apache/stratos/cloud/controller/iaases/openstack/networking/NeutronNetworkingApiTest.java @@ -96,11 +96,11 @@ public class NeutronNetworkingApiTest extends TestCase { @Test public void testGetAllPredefinedFloatingIPs() throws Exception { - List<String> allPredefinedFlotaingIPs = neutronNetworkingApi.getAllPredefinedFloatingIPs(networkInterfaces); + List<String> allPredefinedFloatingIPs = neutronNetworkingApi.getAllPredefinedFloatingIPs(networkInterfaces); Assert.assertEquals(String.format("%s. Predefined floating IP count not valid", validationError), 1, - allPredefinedFlotaingIPs.size()); + allPredefinedFloatingIPs.size()); Assert.assertTrue(String.format("%s. Predefined floating IP not returned", validationError), - allPredefinedFlotaingIPs.contains("192.168.16.59")); + allPredefinedFloatingIPs.contains("192.168.16.59")); } @Test
