IPv6: Add nic response to user vm
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f55c2331 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f55c2331 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f55c2331 Branch: refs/heads/network-refactor Commit: f55c23318abb47e314f3a3c1abe245c4746cfc59 Parents: f7047eb Author: Sheng Yang <[email protected]> Authored: Thu Jan 31 17:05:02 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Thu Jan 31 17:05:02 2013 -0800 ---------------------------------------------------------------------- api/src/com/cloud/api/ApiConstants.java | 1 + .../cloud/api/response/VlanIpRangeResponse.java | 4 -- server/src/com/cloud/api/ApiResponseHelper.java | 9 +++++ .../src/com/cloud/network/PublicIpv6AddressVO.java | 1 - server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 6 +++- server/src/com/cloud/vm/dao/UserVmData.java | 27 +++++++++++++++ 6 files changed, 42 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f55c2331/api/src/com/cloud/api/ApiConstants.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/ApiConstants.java b/api/src/com/cloud/api/ApiConstants.java index a0da53e..f24ae0a 100755 --- a/api/src/com/cloud/api/ApiConstants.java +++ b/api/src/com/cloud/api/ApiConstants.java @@ -93,6 +93,7 @@ public class ApiConstants { public static final String INTERNAL_DNS2 = "internaldns2"; public static final String INTERVAL_TYPE = "intervaltype"; public static final String IP_ADDRESS = "ipaddress"; + public static final String IP6_ADDRESS = "ip6address"; public static final String IP_ADDRESS_ID = "ipaddressid"; public static final String IP_AVAILABLE = "ipavailable"; public static final String IP_LIMIT = "iplimit"; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f55c2331/api/src/com/cloud/api/response/VlanIpRangeResponse.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/response/VlanIpRangeResponse.java b/api/src/com/cloud/api/response/VlanIpRangeResponse.java index 227220c..f590c19 100644 --- a/api/src/com/cloud/api/response/VlanIpRangeResponse.java +++ b/api/src/com/cloud/api/response/VlanIpRangeResponse.java @@ -186,8 +186,4 @@ public class VlanIpRangeResponse extends BaseResponse implements ControlledEntit public void setIp6Cidr(String ip6Cidr) { this.ip6Cidr = ip6Cidr; } - - public String getphysicalNetworkId() { - return physicalNetworkId; - } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f55c2331/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 9dd9e29..a68c7c3 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1627,6 +1627,9 @@ public class ApiResponseHelper implements ResponseGenerator { nicResponse.setIpaddress(singleNicProfile.getIp4Address()); nicResponse.setGateway(singleNicProfile.getGateway()); nicResponse.setNetmask(singleNicProfile.getNetmask()); + nicResponse.setIp6Address(singleNicProfile.getIp6Address()); + nicResponse.setIp6Gateway(singleNicProfile.getIp6Gateway()); + nicResponse.setIp6Cidr(singleNicProfile.getIp6Cidr()); nicResponse.setNetworkid(singleNicProfile.getNetworkId()); nicResponse.setNetworkName(ApiDBUtils.findNetworkById(singleNicProfile.getNetworkId()).getName()); if (acct.getType() == Account.ACCOUNT_TYPE_ADMIN) { @@ -1769,6 +1772,9 @@ public class ApiResponseHelper implements ResponseGenerator { nicResponse.setIpaddress(singleNicProfile.getIp4Address()); nicResponse.setGateway(singleNicProfile.getGateway()); nicResponse.setNetmask(singleNicProfile.getNetmask()); + nicResponse.setIp6Address(singleNicProfile.getIp6Address()); + nicResponse.setIp6Gateway(singleNicProfile.getIp6Gateway()); + nicResponse.setIp6Cidr(singleNicProfile.getIp6Cidr()); nicResponse.setNetworkid(singleNicProfile.getNetworkId()); nicResponse.setNetworkName(network.getName()); @@ -3415,6 +3421,9 @@ public class ApiResponseHelper implements ResponseGenerator { nr.setNetmask(nd.getNetmask()); nr.setGateway(nd.getGateway()); nr.setIpaddress(nd.getIpaddress()); + nr.setIp6Address(nd.getIp6Address()); + nr.setIp6Gateway(nd.getIp6Gateway()); + nr.setIp6Cidr(nd.getIp6Cidr()); nr.setIsolationUri(nd.getIsolationUri()); nr.setBroadcastUri(nd.getBroadcastUri()); nr.setTrafficType(nd.getTrafficType()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f55c2331/server/src/com/cloud/network/PublicIpv6AddressVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/PublicIpv6AddressVO.java b/server/src/com/cloud/network/PublicIpv6AddressVO.java index 7594fc1..e5d00a1 100644 --- a/server/src/com/cloud/network/PublicIpv6AddressVO.java +++ b/server/src/com/cloud/network/PublicIpv6AddressVO.java @@ -39,7 +39,6 @@ public class PublicIpv6AddressVO implements PublicIpv6Address { @Column(name="id") long id; - @Id @Column(name="ip_address") @Enumerated(value=EnumType.STRING) private String address = null; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f55c2331/server/src/com/cloud/vm/dao/UserVmDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java index db1d877..c003f6a 100755 --- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -87,6 +87,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use "vm_template.enable_password, service_offering.id, disk_offering.name, storage_pool.id, storage_pool.pool_type, " + "service_offering.cpu, service_offering.speed, service_offering.ram_size, volumes.id, volumes.device_id, volumes.volume_type, security_group.id, security_group.name, " + "security_group.description, nics.id, nics.ip4_address, nics.default_nic, nics.gateway, nics.network_id, nics.netmask, nics.mac_address, nics.broadcast_uri, nics.isolation_uri, " + + "nics.ip6_address, nics.ip6_gateway, nics.ip6_cidr, " + "networks.traffic_type, networks.guest_type, user_ip_address.id, user_ip_address.public_ip_address from vm_instance " + "left join account on vm_instance.account_id=account.id " + "left join domain on vm_instance.domain_id=domain.id " + @@ -508,7 +509,10 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use nicResponse.setGateway(rs.getString("nics.gateway")); nicResponse.setNetmask(rs.getString("nics.netmask")); nicResponse.setNetworkid(rs.getLong("nics.network_id")); - nicResponse.setMacAddress(rs.getString("nics.mac_address")); + nicResponse.setMacAddress(rs.getString("nics.mac_address")); + nicResponse.setIp6Address(rs.getString("nics.ip6_address")); + nicResponse.setIp6Gateway(rs.getString("nics.ip6_gateway")); + nicResponse.setIp6Cidr(rs.getString("nics.ip6_cidr")); int account_type = rs.getInt("account.type"); if (account_type == Account.ACCOUNT_TYPE_ADMIN) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f55c2331/server/src/com/cloud/vm/dao/UserVmData.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/dao/UserVmData.java b/server/src/com/cloud/vm/dao/UserVmData.java index 82c737c..7710f19 100644 --- a/server/src/com/cloud/vm/dao/UserVmData.java +++ b/server/src/com/cloud/vm/dao/UserVmData.java @@ -450,6 +450,9 @@ public class UserVmData { private String type; private Boolean isDefault; private String macAddress; + private String ip6Gateway; + private String ip6Address; + private String ip6Cidr; public String getObjectName() { return objectName; @@ -571,6 +574,30 @@ public class UserVmData { return false; return true; } + + public String getIp6Gateway() { + return ip6Gateway; + } + + public void setIp6Gateway(String ip6Gateway) { + this.ip6Gateway = ip6Gateway; + } + + public String getIp6Address() { + return ip6Address; + } + + public void setIp6Address(String ip6Address) { + this.ip6Address = ip6Address; + } + + public String getIp6Cidr() { + return ip6Cidr; + } + + public void setIp6Cidr(String ip6Cidr) { + this.ip6Cidr = ip6Cidr; + } } public class SecurityGroupData {
