From d427cdae1e7b8ccf222d99c64c185e7214677942 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 16 Dec 2010 12:04:55 -0800
Subject: [PATCH] 1) Return associatedIpAddress in listPublicIpAddresses
 command. 2) Disabled create/deleteNetworkOffering API commands

---
 api/src/com/cloud/api/response/IPAddressResponse.java | 11 +++++++++++
 api/src/com/cloud/network/IpAddress.java              |  2 ++
 client/tomcatconf/commands.properties.in              |  4 ++--
 server/src/com/cloud/api/ApiResponseHelper.java       |  2 ++
 server/src/com/cloud/network/IPAddressVO.java         |  1 +
 server/src/com/cloud/network/addr/PublicIp.java       |  5 +++++
 6 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/api/src/com/cloud/api/response/IPAddressResponse.java b/api/src/com/cloud/api/response/IPAddressResponse.java
index 6313c81b6e9..68e560c4460 100644
--- a/api/src/com/cloud/api/response/IPAddressResponse.java
+++ b/api/src/com/cloud/api/response/IPAddressResponse.java
@@ -59,6 +59,9 @@ public class IPAddressResponse extends BaseResponse {
     @SerializedName("isstaticnat") @Param(description="true if this ip is for static nat, false otherwise")
     private Boolean staticNat;
     
+    @SerializedName("associatednetworkid") @Param(description="the ID of the Network associated with the IP address")
+    private Long associatedNetworkId;
+    
     public String getIpAddress() {
         return ipAddress;
     }
@@ -155,4 +158,12 @@ public class IPAddressResponse extends BaseResponse {
 		this.staticNat = staticNat;
 	}
 
+    public Long getAssociatedNetworkId() {
+        return associatedNetworkId;
+    }
+
+    public void setAssociatedNetworkId(Long networkId) {
+        this.associatedNetworkId = networkId;
+    }
+
 }
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
index 8cb87a00862..02436d629d1 100644
--- a/api/src/com/cloud/network/IpAddress.java
+++ b/api/src/com/cloud/network/IpAddress.java
@@ -63,4 +63,6 @@ public interface IpAddress extends ControlledEntity {
     State getState();
     
     boolean readyToUse();
+    
+    Long getAssociatedNetworkId();
 }
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 875d647e240..75c215043de 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -235,9 +235,9 @@ removeVpnUser=com.cloud.api.commands.RemoveVpnUserCmd;15
 listVpnUsers=com.cloud.api.commands.ListVpnUsersCmd;15
 
 #### network offering commands
-createNetworkOffering=com.cloud.api.commands.CreateNetworkOfferingCmd;1
+#### createNetworkOffering=com.cloud.api.commands.CreateNetworkOfferingCmd;1
 updateNetworkOffering=com.cloud.api.commands.UpdateNetworkOfferingCmd;1
-deleteNetworkOffering=com.cloud.api.commands.DeleteNetworkOfferingCmd;1
+#### deleteNetworkOffering=com.cloud.api.commands.DeleteNetworkOfferingCmd;1
 listNetworkOfferings=com.cloud.api.commands.ListNetworkOfferingsCmd;15
 
 #### network commands
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index b2ace211b76..8796ff3efd5 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -610,6 +610,8 @@ public class ApiResponseHelper implements ResponseGenerator {
 
         ipResponse.setForVirtualNetwork(forVirtualNetworks);
         ipResponse.setStaticNat(ipAddress.isOneToOneNat());
+        
+        ipResponse.setAssociatedNetworkId(ipAddress.getAssociatedNetworkId());
 
         // show this info to admin only
         Account account = UserContext.current().getAccount();
diff --git a/server/src/com/cloud/network/IPAddressVO.java b/server/src/com/cloud/network/IPAddressVO.java
index 95ff75598d8..583c09b42d7 100644
--- a/server/src/com/cloud/network/IPAddressVO.java
+++ b/server/src/com/cloud/network/IPAddressVO.java
@@ -108,6 +108,7 @@ public class IPAddressVO implements IpAddress {
 		return allocatedToAccountId;
 	}
 	
+	@Override
 	public Long getAssociatedNetworkId() {
 	    return associatedNetworkId;
 	}
diff --git a/server/src/com/cloud/network/addr/PublicIp.java b/server/src/com/cloud/network/addr/PublicIp.java
index 9d0e726b6e0..ce12278259a 100644
--- a/server/src/com/cloud/network/addr/PublicIp.java
+++ b/server/src/com/cloud/network/addr/PublicIp.java
@@ -121,4 +121,9 @@ public class PublicIp implements IpAddress {
     public String getMacAddress() {
         return macAddress;
     }
+    
+    @Override
+    public Long getAssociatedNetworkId() {
+        return _addr.getAssociatedNetworkId();
+    }
 }