bug 3120: incremental fix

scripts/network/domr/ipassoc.sh

@@ -124,7 +124,7 @@ remove_an_ip () {
   fi
 }
 
-#set -x
+set -x
 
 rflag=
 iflag=
@@ -184,10 +184,10 @@ do
 done
 
 #1:1 NAT
-if [ "$Gflag" == "1" ] && [ "$fflag" == "1" ] && [ "$Aflag" == "1" ]
+if [ "$Gflag" == "1" ]
 then
   add_nat_entry $domRIp $publicIp 
-  if [ $? -gt 0 ]
+  if [ $? -eq 0 ]
   then
     add_one_to_one_nat_entry $guestIp $publicIp $domRIp
   fi

server/src/com/cloud/api/commands/AssociateIPAddrCmd.java

@@ -72,10 +72,7 @@ public class AssociateIPAddrCmd extends BaseCmd {
         String accountName = (String)params.get(BaseCmd.Properties.ACCOUNT.getName());
         Long domainId = (Long)params.get(BaseCmd.Properties.DOMAIN_ID.getName());
         Long vmId = (Long)params.get(BaseCmd.Properties.VIRTUAL_MACHINE_ID.getName());
-        
-        //todo REMOVE
-        //vmId = new Long(3);
-        
+ 
         String newIpAddr = null;
         String errorDesc = null;
         Long accountId = null;