Elimiate mystery guestIp in IpAddressTO

Sheng Yang · Sheng Yang · commit fe8a2992a210 · 2012-09-12T15:42:48.000-07:00
Nobody can explain why it's there...

Also fix wrong return result of several empty network element callbacks
diff --git a/api/src/com/cloud/agent/api/to/IpAddressTO.java b/api/src/com/cloud/agent/api/to/IpAddressTO.java
@@ -30,13 +30,12 @@ public class IpAddressTO {
     private String vlanGateway;
     private String vlanNetmask;
     private String vifMacAddress;
-    private String guestIp;
     private Integer networkRate;
     private TrafficType trafficType;
     private String networkName;
 
     public IpAddressTO(long accountId, String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String vlanId,
-            String vlanGateway, String vlanNetmask, String vifMacAddress, String guestIp, Integer networkRate, boolean isOneToOneNat) {
+            String vlanGateway, String vlanNetmask, String vifMacAddress, Integer networkRate, boolean isOneToOneNat) {
         this.accountId = accountId;
         this.publicIp = ipAddress;
         this.add = add;
@@ -46,7 +45,6 @@ public IpAddressTO(long accountId, String ipAddress, boolean add, boolean firstI
         this.vlanGateway = vlanGateway;
         this.vlanNetmask = vlanNetmask;
         this.vifMacAddress = vifMacAddress;
-        this.guestIp = guestIp;
         this.networkRate = networkRate;
         this.oneToOneNat = isOneToOneNat;
     }
@@ -58,10 +56,6 @@ public long getAccountId() {
         return accountId;
     }
 
-    public String getGuestIp(){
-        return guestIp;
-    }
-
     public String getPublicIp() {
         return publicIp;
     }
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -404,7 +404,7 @@ protected Answer execute(final IpAssocCommand cmd) {
         for (IpAddressTO ip : ips) {
             result = assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), 
                      ip.isFirstIP(), ip.isSourceNat(), ip.getVlanId(), ip.getVlanGateway(), ip.getVlanNetmask(),
-                     ip.getVifMacAddress(), ip.getGuestIp(), 2);
+                     ip.getVifMacAddress(), 2);
             if (result != null) {
                 results[i++] = IpAssocAnswer.errorResult;
             } else {
@@ -812,7 +812,7 @@ public String assignPublicIpAddress(final String vmName,
             final String privateIpAddress, final String publicIpAddress,
             final boolean add, final boolean firstIP, final boolean sourceNat,
             final String vlanId, final String vlanGateway,
-            final String vlanNetmask, final String vifMacAddress, String guestIp, int nicNum){
+            final String vlanNetmask, final String vifMacAddress, int nicNum){
 
         String args = "";
         if (add) {
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1534,8 +1534,7 @@ public Answer execute(IpAssocCommand cmd) {
                 result = _virtRouterResource.assignPublicIpAddress(routerName,
                         routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(),
                         ip.isSourceNat(), ip.getVlanId(), ip.getVlanGateway(),
-                        ip.getVlanNetmask(), ip.getVifMacAddress(),
-                        ip.getGuestIp(), nicNum);
+                        ip.getVlanNetmask(), ip.getVifMacAddress(), nicNum);
 
                 if (result != null) {
                     results[i++] = IpAssocAnswer.errorResult;
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1365,7 +1365,7 @@ protected void assignVPCPublicIpAddress(String domrName, String routerIp, IpAddr
     }
 
     protected void assignPublicIpAddress(VirtualMachineMO vmMo, final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP,
-            final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress, String guestIp) throws Exception {
+            final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception {
 
         String publicNeworkName = HypervisorHostHelper.getPublicNetworkNamePrefix(vlanId);
         Pair<Integer, VirtualDevice> publicNicInfo = vmMo.getNicDeviceIndex(publicNeworkName);
@@ -1570,7 +1570,7 @@ protected Answer execute(IpAssocCommand cmd) {
 
             for (IpAddressTO ip : ips) {
                 assignPublicIpAddress(vmMo, routerName, controlIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getVlanId(), ip.getVlanGateway(), ip.getVlanNetmask(),
-                        ip.getVifMacAddress(), ip.getGuestIp());
+                        ip.getVifMacAddress());
                 results[i++] = ip.getPublicIp() + " - success";
             }
         } catch (Throwable e) {
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -1849,7 +1849,7 @@ protected Answer execute(final SavePasswordCommand cmd) {
 
 
     protected void assignPublicIpAddress(Connection conn, String vmName, String privateIpAddress, String publicIpAddress, boolean add, boolean firstIP,
-            boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, String guestIp, Integer networkRate, TrafficType trafficType, String name) throws InternalErrorException {
+            boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, Integer networkRate, TrafficType trafficType, String name) throws InternalErrorException {
 
         try {
             VM router = getVM(conn, vmName);
@@ -2028,7 +2028,7 @@ protected Answer execute(IpAssocCommand cmd) {
             for (IpAddressTO ip : ips) {
 
                 assignPublicIpAddress(conn, routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getVlanId(),
-                        ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress(), ip.getGuestIp(), ip.getNetworkRate(), ip.getTrafficType(), ip.getNetworkName());
+                        ip.getVlanGateway(), ip.getVlanNetmask(), ip.getVifMacAddress(), ip.getNetworkRate(), ip.getTrafficType(), ip.getNetworkName());
                 results[i++] = ip.getPublicIp() + " - success";
             }
         } catch (InternalErrorException e) {
diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
@@ -464,7 +464,7 @@ public boolean verifyServicesCombination(Set<Service> services) {
     @Override
     public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Service> service) throws ResourceUnavailableException {
         // return true, as IP will be associated as part of LB rule configuration
-        return false;
+        return true;
     }
 
     @Override
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
@@ -543,7 +543,7 @@ public IpDeployer getIpDeployer(Network network) {
 
     @Override
     public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Service> service) throws ResourceUnavailableException {
-        // TODO Auto-generated method stub
-        return false;
+        // return true, as IP will be associated as part of static NAT/port forwarding rule configuration
+        return true;
     }
 }
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
@@ -617,7 +617,7 @@ public boolean verifyServicesCombination(Set<Service> services) {
     @Override
     public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Service> service) throws ResourceUnavailableException {
         // return true, as IP will be associated as part of LB rule configuration
-        return false;
+        return true;
     }
 
     @Override
diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
@@ -413,7 +413,7 @@ public boolean manageGuestNetworkWithExternalFirewall(boolean add, Network netwo
         // Get network rate
         Integer networkRate = _networkMgr.getNetworkRate(network.getId(), null);
 
-        IpAddressTO ip = new IpAddressTO(account.getAccountId(), sourceNatIpAddress, add, false, !sharedSourceNat, publicVlanTag, null, null, null, null, networkRate, false);
+        IpAddressTO ip = new IpAddressTO(account.getAccountId(), sourceNatIpAddress, add, false, !sharedSourceNat, publicVlanTag, null, null, null, networkRate, false);
         IpAddressTO[] ips = new IpAddressTO[1];
         ips[0] = ip;
         IpAssocCommand cmd = new IpAssocCommand(ips);
diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
@@ -946,7 +946,7 @@ public boolean manageGuestNetworkWithExternalLoadBalancer(boolean add, Network g
             selfIp = selfipNic.getIp4Address();
         }
 
-        IpAddressTO ip = new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag), selfIp, guestVlanNetmask, null, null, networkRate, false);
+        IpAddressTO ip = new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag), selfIp, guestVlanNetmask, null, networkRate, false);
         IpAddressTO[] ips = new IpAddressTO[1];
         ips[0] = ip;
         IpAssocCommand cmd = new IpAssocCommand(ips);
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2654,10 +2654,8 @@ public int compare(PublicIpAddress o1, PublicIpAddress o2) {
                 String vlanNetmask = ipAddr.getNetmask();
                 String vifMacAddress = ipAddr.getMacAddress();
 
-                String vmGuestAddress = null;
-
                 IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, firstIP, 
-                        sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, vmGuestAddress, networkRate, ipAddr.isOneToOneNat());
+                        sourceNat, vlanId, vlanGateway, vlanNetmask, vifMacAddress, networkRate, ipAddr.isOneToOneNat());
 
                 ip.setTrafficType(network.getTrafficType());
                 ip.setNetworkName(_networkMgr.getNetworkTag(router.getHypervisorType(), network));
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -497,7 +497,7 @@ private void createVpcAssociatePublicIPCommands(final VirtualRouter router, fina
                 
                 IpAddressTO ip = new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, false, 
                         ipAddr.isSourceNat(), ipAddr.getVlanTag(), ipAddr.getGateway(), ipAddr.getNetmask(), macAddress,
-                        null, networkRate, ipAddr.isOneToOneNat());
+                        networkRate, ipAddr.isOneToOneNat());
 
                 ip.setTrafficType(network.getTrafficType());
                 ip.setNetworkName(_networkMgr.getNetworkTag(router.getHypervisorType(), network));
@@ -1172,7 +1172,7 @@ private void createVpcAssociatePrivateIPCommands(final VirtualRouter router, fin
                 Network network = _networkMgr.getNetwork(ipAddr.getNetworkId());
                 IpAddressTO ip = new IpAddressTO(Account.ACCOUNT_ID_SYSTEM, ipAddr.getIpAddress(), add, false, 
                         false, ipAddr.getVlanTag(), ipAddr.getGateway(), ipAddr.getNetmask(), ipAddr.getMacAddress(),
-                        null, null, false);
+                        null, false);
 
                 ip.setTrafficType(network.getTrafficType());
                 ip.setNetworkName(_networkMgr.getNetworkTag(router.getHypervisorType(), network));

Original file line number	Diff line number	Diff line change
`@@ -1365,7 +1365,7 @@ protected void assignVPCPublicIpAddress(String domrName, String routerIp, IpAddr`
`1365`	`1365`	`}`
`1366`	`1366`
`1367`	`1367`	`protected void assignPublicIpAddress(VirtualMachineMO vmMo, final String vmName, final String privateIpAddress, final String publicIpAddress, final boolean add, final boolean firstIP,`
`1368`		`- final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress, String guestIp) throws Exception {`
	`1368`	`+ final boolean sourceNat, final String vlanId, final String vlanGateway, final String vlanNetmask, final String vifMacAddress) throws Exception {`
`1369`	`1369`
`1370`	`1370`	`String publicNeworkName = HypervisorHostHelper.getPublicNetworkNamePrefix(vlanId);`
`1371`	`1371`	`Pair<Integer, VirtualDevice> publicNicInfo = vmMo.getNicDeviceIndex(publicNeworkName);`
`@@ -1570,7 +1570,7 @@ protected Answer execute(IpAssocCommand cmd) {`
`1570`	`1570`
`1571`	`1571`	`for (IpAddressTO ip : ips) {`
`1572`	`1572`	`assignPublicIpAddress(vmMo, routerName, controlIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getVlanId(), ip.getVlanGateway(), ip.getVlanNetmask(),`
`1573`		`- ip.getVifMacAddress(), ip.getGuestIp());`
	`1573`	`+ ip.getVifMacAddress());`
`1574`	`1574`	`results[i++] = ip.getPublicIp() + " - success";`
`1575`	`1575`	`}`
`1576`	`1576`	`} catch (Throwable e) {`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ public boolean verifyServicesCombination(Set<Service> services) {`
`464`	`464`	`@Override`
`465`	`465`	`public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Service> service) throws ResourceUnavailableException {`
`466`	`466`	`// return true, as IP will be associated as part of LB rule configuration`
`467`		`- return false;`
	`467`	`+ return true;`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ public IpDeployer getIpDeployer(Network network) {`
`543`	`543`
`544`	`544`	`@Override`
`545`	`545`	`public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Service> service) throws ResourceUnavailableException {`
`546`		`- // TODO Auto-generated method stub`
`547`		`- return false;`
	`546`	`+ // return true, as IP will be associated as part of static NAT/port forwarding rule configuration`
	`547`	`+ return true;`
`548`	`548`	`}`
`549`	`549`	`}`
Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ public boolean verifyServicesCombination(Set<Service> services) {`
`617`	`617`	`@Override`
`618`	`618`	`public boolean applyIps(Network network, List<? extends PublicIpAddress> ipAddress, Set<Service> service) throws ResourceUnavailableException {`
`619`	`619`	`// return true, as IP will be associated as part of LB rule configuration`
`620`		`- return false;`
	`620`	`+ return true;`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -946,7 +946,7 @@ public boolean manageGuestNetworkWithExternalLoadBalancer(boolean add, Network g`
`946`	`946`	`selfIp = selfipNic.getIp4Address();`
`947`	`947`	`}`
`948`	`948`
`949`		`- IpAddressTO ip = new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag), selfIp, guestVlanNetmask, null, null, networkRate, false);`
	`949`	`+ IpAddressTO ip = new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag), selfIp, guestVlanNetmask, null, networkRate, false);`
`950`	`950`	`IpAddressTO[] ips = new IpAddressTO[1];`
`951`	`951`	`ips[0] = ip;`
`952`	`952`	`IpAssocCommand cmd = new IpAssocCommand(ips);`