You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/18 00:19:29 UTC
git commit: updated refs/heads/master to 11162f5
Updated Branches:
refs/heads/master 112446602 -> 11162f591
Removed set() methods from IpAddress related interfaces
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11162f59
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11162f59
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11162f59
Branch: refs/heads/master
Commit: 11162f5917ab194f85e41bca7b3dc39bd3bbaeef
Parents: 1124466
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Apr 17 15:04:36 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Apr 17 15:11:38 2013 -0700
----------------------------------------------------------------------
api/src/com/cloud/network/IpAddress.java | 9 --------
api/src/com/cloud/network/PublicIpAddress.java | 3 --
server/src/com/cloud/network/addr/PublicIp.java | 18 +---------------
server/src/com/cloud/network/dao/IPAddressVO.java | 2 -
4 files changed, 1 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11162f59/api/src/com/cloud/network/IpAddress.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java
index fce8f38..71c9b4e 100644
--- a/api/src/com/cloud/network/IpAddress.java
+++ b/api/src/com/cloud/network/IpAddress.java
@@ -78,16 +78,7 @@ public interface IpAddress extends ControlledEntity, Identity, InternalIdentity
boolean getSystem();
- /**
- * @return
- */
Long getVpcId();
- /**
- * @param vpcId
- */
- void setVpcId(Long vpcId);
String getVmIp();
- void setVmIp(String vmIp);
-
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11162f59/api/src/com/cloud/network/PublicIpAddress.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/com/cloud/network/PublicIpAddress.java
index d81e9c1..916d434 100644
--- a/api/src/com/cloud/network/PublicIpAddress.java
+++ b/api/src/com/cloud/network/PublicIpAddress.java
@@ -30,7 +30,4 @@ public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan, Inte
public String getNetmask();
public String getGateway();
-
- @Override
- public String getVlanTag();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11162f59/server/src/com/cloud/network/addr/PublicIp.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/addr/PublicIp.java b/server/src/com/cloud/network/addr/PublicIp.java
index 8217e4e..25e9d30 100644
--- a/server/src/com/cloud/network/addr/PublicIp.java
+++ b/server/src/com/cloud/network/addr/PublicIp.java
@@ -194,23 +194,12 @@ public class PublicIp implements PublicIpAddress {
public boolean getSystem() {
return _addr.getSystem();
}
-
- /* (non-Javadoc)
- * @see com.cloud.network.IpAddress#getVpcId()
- */
+
@Override
public Long getVpcId() {
return _addr.getVpcId();
}
- /* (non-Javadoc)
- * @see com.cloud.network.IpAddress#setVpcId(java.lang.Long)
- */
- @Override
- public void setVpcId(Long vpcId) {
- _addr.setVpcId(vpcId);
- }
-
@Override
public String getIp6Gateway() {
return _vlan.getIp6Gateway();
@@ -230,9 +219,4 @@ public class PublicIp implements PublicIpAddress {
public String getVmIp() {
return _addr.getVmIp();
}
-
- @Override
- public void setVmIp(String vmIp) {
- _addr.setVmIp(vmIp);
- }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11162f59/server/src/com/cloud/network/dao/IPAddressVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/dao/IPAddressVO.java b/server/src/com/cloud/network/dao/IPAddressVO.java
index 8ce8d33..c5c78e5 100644
--- a/server/src/com/cloud/network/dao/IPAddressVO.java
+++ b/server/src/com/cloud/network/dao/IPAddressVO.java
@@ -292,7 +292,6 @@ public class IPAddressVO implements IpAddress {
return vpcId;
}
- @Override
public void setVpcId(Long vpcId) {
this.vpcId = vpcId;
}
@@ -302,7 +301,6 @@ public class IPAddressVO implements IpAddress {
return vmIp;
}
- @Override
public void setVmIp(String vmIp) {
this.vmIp = vmIp;
}