Alona Kaplan has uploaded a new change for review. Change subject: core: adding "linked" property to vm_interface ......................................................................
core: adding "linked" property to vm_interface adding linked property to- - vm_interface class - vm_interface table - vm_interface_view Change-Id: I9c8d965b66201506d7e4b82d5b53012fd0bf7d61 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/dbscripts/create_views.sql M backend/manager/dbscripts/network_sp.sql A backend/manager/dbscripts/upgrade/03_01_1520_add_linked_to_vm_interface.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java 4 files changed, 26 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/9440/1 diff --git a/backend/manager/dbscripts/create_views.sql b/backend/manager/dbscripts/create_views.sql index d6dd745..1cd250c 100644 --- a/backend/manager/dbscripts/create_views.sql +++ b/backend/manager/dbscripts/create_views.sql @@ -799,7 +799,7 @@ SELECT vm_interface_statistics.rx_rate, vm_interface_statistics.tx_rate, vm_interface_statistics.rx_drop, vm_interface_statistics.tx_drop, vm_interface_statistics.iface_status, vm_interface.type, vm_interface.speed, vm_interface.mac_addr, vm_interface.network_name, vm_interface.name, vm_static.vm_guid, vm_interface.vmt_guid, - vm_static.vm_name, vm_interface.id, 0 AS boot_protocol, 0 AS is_vds, vm_device.is_plugged, vm_interface.port_mirroring + vm_static.vm_name, vm_interface.id, 0 AS boot_protocol, 0 AS is_vds, vm_device.is_plugged, vm_interface.port_mirroring, vm_interface.linked FROM vm_interface_statistics JOIN vm_interface ON vm_interface_statistics.id = vm_interface.id JOIN vm_static ON vm_interface.vm_guid = vm_static.vm_guid @@ -809,7 +809,7 @@ vm_interface_statistics.tx_drop, vm_interface_statistics.iface_status, vm_interface.type, vm_interface.speed, vm_interface.mac_addr, vm_interface.network_name, vm_interface.name, NULL::uuid as vm_guid, vm_interface.vmt_guid, vm_templates.vm_name AS vm_name, vm_interface.id, 0 AS boot_protocol, 0 AS is_vds, - vm_device.is_plugged as is_plugged, vm_interface.port_mirroring + vm_device.is_plugged as is_plugged, vm_interface.port_mirroring, vm_interface.linked FROM vm_interface_statistics RIGHT JOIN vm_interface ON vm_interface_statistics.id = vm_interface.id JOIN vm_static AS vm_templates ON vm_interface.vmt_guid = vm_templates.vm_guid diff --git a/backend/manager/dbscripts/network_sp.sql b/backend/manager/dbscripts/network_sp.sql index 38a52ad..f44de73 100644 --- a/backend/manager/dbscripts/network_sp.sql +++ b/backend/manager/dbscripts/network_sp.sql @@ -379,12 +379,13 @@ v_vm_guid UUID , v_vmt_guid UUID , v_type INTEGER, - v_port_mirroring BOOLEAN) + v_port_mirroring BOOLEAN, + v_linked BOOLEAN) RETURNS VOID AS $procedure$ BEGIN -INSERT INTO vm_interface(id, mac_addr, name, network_name, speed, VM_GUID, VMT_GUID, type, port_mirroring) - VALUES(v_id, v_mac_addr, v_name, v_network_name, v_speed, v_vm_guid, v_vmt_guid, v_type, v_port_mirroring); +INSERT INTO vm_interface(id, mac_addr, name, network_name, speed, VM_GUID, VMT_GUID, type, port_mirroring, linked) + VALUES(v_id, v_mac_addr, v_name, v_network_name, v_speed, v_vm_guid, v_vmt_guid, v_type, v_port_mirroring, v_linked); END; $procedure$ LANGUAGE plpgsql; @@ -400,7 +401,8 @@ v_vm_guid UUID , v_vmt_guid UUID , v_type INTEGER, - v_port_mirroring BOOLEAN) + v_port_mirroring BOOLEAN, + v_linked BOOLEAN) RETURNS VOID --The [vm_interface] table doesn't have a timestamp column. Optimistic concurrency logic cannot be generated @@ -409,7 +411,7 @@ UPDATE vm_interface SET mac_addr = v_mac_addr,name = v_name,network_name = v_network_name, speed = v_speed,VM_GUID = v_vm_guid,VMT_GUID = v_vmt_guid,type = v_type, - _update_date = LOCALTIMESTAMP, port_mirroring = v_port_mirroring + _update_date = LOCALTIMESTAMP, port_mirroring = v_port_mirroring, linked = v_linked WHERE id = v_id; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/dbscripts/upgrade/03_01_1520_add_linked_to_vm_interface.sql b/backend/manager/dbscripts/upgrade/03_01_1520_add_linked_to_vm_interface.sql new file mode 100644 index 0000000..d60f2bf --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_01_1520_add_linked_to_vm_interface.sql @@ -0,0 +1 @@ +select fn_db_add_column('vm_interface', 'linked', 'boolean NOT NULL DEFAULT true'); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java index 156887b..81a8e82 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmNetworkInterface.java @@ -30,12 +30,13 @@ private NGuid vmTemplateId; /* status of the nic. Active nic is one that is plugged to its VM */ private boolean active = true; + private boolean linked = true; private boolean portMirroring; private static final ArrayList<String> _changeablePropertiesList = new ArrayList<String>(Arrays.asList(new String[] { "Id", "Name", "MacAddress", "NetworkName", "Type", "Speed", "Statistics", "VmId", "VmName", - "VmTemplateId", "PortMirroring" + "VmTemplateId", "PortMirroring", "Linked" })); public VmNetworkInterface() { @@ -118,6 +119,14 @@ this.active = active; } + public boolean isLinked() { + return active; + } + + public void setLinked(boolean linked) { + this.linked = linked; + } + @NotNull(message = VmNetworkInterface.VALIDATION_MESSAGE_NAME_NOT_NULL, groups = { CreateEntity.class, UpdateEntity.class }) @Override @@ -156,6 +165,8 @@ .append(getMacAddress()) .append(", active=") .append(isActive()) + .append(", linked=") + .append(isLinked()) .append(", portMirroring=") .append(isPortMirroring()) .append(", vmId=") @@ -173,6 +184,7 @@ final int prime = 31; int result = super.hashCode(); result = prime * result + (active ? 1231 : 1237); + result = prime * result + (linked ? 1231 : 1237); result = prime * result + ((vmId == null) ? 0 : vmId.hashCode()); result = prime * result + ((vmName == null) ? 0 : vmName.hashCode()); result = prime * result + ((vmTemplateId == null) ? 0 : vmTemplateId.hashCode()); @@ -194,6 +206,9 @@ if (active != other.active) { return false; } + if (linked != other.linked) { + return false; + } if (vmId == null) { if (other.vmId != null) { return false; -- To view, visit http://gerrit.ovirt.org/9440 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9c8d965b66201506d7e4b82d5b53012fd0bf7d61 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
