From b2efa6872b9671dd8bf6e2ae8873db98fac40cf0 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Wed, 15 Sep 2010 15:37:18 -0700
Subject: [PATCH] a few more code cleanup tasks

---
 server/src/com/cloud/api/BaseCmd.java                     | 1 -
 server/src/com/cloud/api/commands/AssociateIPAddrCmd.java | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java
index f5fc17f9ab8..e1f42327b4c 100755
--- a/server/src/com/cloud/api/BaseCmd.java
+++ b/server/src/com/cloud/api/BaseCmd.java
@@ -281,7 +281,6 @@ public abstract class BaseCmd {
         OS_TYPE_ID("ostypeid", BaseCmd.TYPE_LONG, "osTypeId"),
         OS_TYPE_NAME("ostypename", BaseCmd.TYPE_STRING, "osTypeName"),
         OP("op", BaseCmd.TYPE_STRING, "op"),
-        ONE_TO_ONE_NAT("onetoonenat",BaseCmd.TYPE_BOOLEAN,"oneToOneNat"),
         PAGE("page", BaseCmd.TYPE_INT, "page"),
         PAGESIZE("pagesize", BaseCmd.TYPE_INT, "pagesize"),
         PARENT_ID("parentid", BaseCmd.TYPE_LONG, "parentId"),
diff --git a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java
index c4a2da97eae..a4c06429d3a 100644
--- a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java
+++ b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java
@@ -48,8 +48,7 @@ public class AssociateIPAddrCmd extends BaseCmd {
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE));
         s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.USER_ID, Boolean.FALSE));
-        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.TRUE));
-        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ONE_TO_ONE_NAT, Boolean.FALSE));
+        s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.TRUE));
     }
 
     public String getName() {