apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

SecurityGroupDao: do join with "nics" table instead of "user_vm" as we keep ip address information in nics.

Browse Source
This commit is contained in:
alena 2011-04-12 11:15:22 -07:00
parent 1a81515566
commit 1966b4f449
1 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/cloud/network/security/SecurityGroupVMMapVO.java
View File

@ -32,14 +32,9 @@ import com.cloud.vm.VirtualMachine.State;
@Entity @Entity
@Table(name = ("security_group_vm_map")) @Table(name = ("security_group_vm_map"))
@SecondaryTables({ @SecondaryTables({ @SecondaryTable(name = "nics", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "instance_id") }),
@SecondaryTable(name="user_vm", @SecondaryTable(name = "vm_instance", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "id") }),
pkJoinColumns={@PrimaryKeyJoinColumn(name="instance_id", referencedColumnName="id")}), @SecondaryTable(name = "security_group", pkJoinColumns = { @PrimaryKeyJoinColumn(name = "security_group_id", referencedColumnName = "id") }) })
@SecondaryTable(name="vm_instance",
pkJoinColumns={@PrimaryKeyJoinColumn(name="instance_id", referencedColumnName="id")}),
@SecondaryTable(name="security_group",
pkJoinColumns={@PrimaryKeyJoinColumn(name="security_group_id", referencedColumnName="id")})
})
public class SecurityGroupVMMapVO { public class SecurityGroupVMMapVO {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@ -52,7 +47,7 @@ public class SecurityGroupVMMapVO {
@Column(name = "instance_id") @Column(name = "instance_id")
private long instanceId; private long instanceId;
@Column(name="guest_ip_address", table="user_vm", insertable=false, updatable=false) @Column(name = "ip4_address", table = "nics", insertable = false, updatable = false)
private String guestIpAddress; private String guestIpAddress;
@Column(name = "state", table = "vm_instance", insertable = false, updatable = false) @Column(name = "state", table = "vm_instance", insertable = false, updatable = false)
@ -61,7 +56,8 @@ public class SecurityGroupVMMapVO {
@Column(name = "name", table = "security_group", insertable = false, updatable = false) @Column(name = "name", table = "security_group", insertable = false, updatable = false)
private String groupName; private String groupName;
public SecurityGroupVMMapVO() { } public SecurityGroupVMMapVO() {
}
public SecurityGroupVMMapVO(long securityGroupId, long instanceId) { public SecurityGroupVMMapVO(long securityGroupId, long instanceId) {
this.securityGroupId = securityGroupId; this.securityGroupId = securityGroupId;