apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

IPv6: Add ipv6 for user vm view

Browse Source
This commit is contained in:
Sheng Yang 2013-02-19 15:16:50 -08:00
parent da75e4ac8a
commit 817548bac1
3 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
View File

@ -186,6 +186,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
nicResponse.setNetmask(userVm.getNetmask());
nicResponse.setNetworkid(userVm.getNetworkUuid());
nicResponse.setMacAddress(userVm.getMacAddress());
nicResponse.setIp6Address(userVm.getIp6Address());
nicResponse.setIp6Gateway(userVm.getIp6Gateway());
nicResponse.setIp6Cidr(userVm.getIp6Cidr());
if (userVm.getBroadcastUri() != null) {
nicResponse.setBroadcastUri(userVm.getBroadcastUri().toString());
}
@ -244,6 +247,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
nicResponse.setNetmask(uvo.getNetmask());
nicResponse.setNetworkid(uvo.getNetworkUuid());
nicResponse.setMacAddress(uvo.getMacAddress());
nicResponse.setIp6Address(uvo.getIp6Address());
nicResponse.setIp6Gateway(uvo.getIp6Gateway());
nicResponse.setIp6Cidr(uvo.getIp6Cidr());
if (uvo.getBroadcastUri() != null) {
nicResponse.setBroadcastUri(uvo.getBroadcastUri().toString());
}

47
server/src/com/cloud/api/query/vo/UserVmJoinVO.java
View File

@ -269,6 +269,15 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
@Column(name = "netmask")
private String netmask;
@Column(name = "ip6_address")
private String ip6Address;
@Column(name = "ip6_gateway")
private String ip6Gateway;
@Column(name = "ip6_cidr")
private String ip6Cidr;
@Column(name = "mac_address")
private String macAddress;
@ -1611,4 +1620,42 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
return toString;
}
public String getIp6Address() {
return ip6Address;
}
public void setIp6Address(String ip6Address) {
this.ip6Address = ip6Address;
}
public String getIp6Gateway() {
return ip6Gateway;
}
public void setIp6Gateway(String ip6Gateway) {
this.ip6Gateway = ip6Gateway;
}
public String getIp6Cidr() {
return ip6Cidr;
}
public void setIp6Cidr(String ip6Cidr) {
this.ip6Cidr = ip6Cidr;
}
}

3
setup/db/db/schema-40to410.sql
View File

@ -598,6 +598,9 @@ CREATE VIEW `cloud`.`user_vm_view` AS
nics.uuid nic_uuid,
nics.network_id network_id,
nics.ip4_address ip_address,
nics.ip6_address ip6_address,
nics.ip6_gateway ip6_gateway,
nics.ip6_cidr ip6_cidr,
nics.default_nic is_default_nic,
nics.gateway gateway,
nics.netmask netmask,