Muli Salem has uploaded a new change for review.
Change subject: engine: Add Network Search for Cluster Name
......................................................................
engine: Add Network Search for Cluster Name
This patch adds the cluster name column to network_cluster_view.
It also joins the network and network_cluster tables.
Change-Id: I77bc293ac47b7cc94a1d4355da2fec11649c4b47
Signed-off-by: Muli Salem <msa...@redhat.com>
---
M backend/manager/dbscripts/create_views.sql
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java
A
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkCrossRefAutoCompleter.java
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
4 files changed, 25 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/9155/1
diff --git a/backend/manager/dbscripts/create_views.sql
b/backend/manager/dbscripts/create_views.sql
index 4561008..af73e5b 100644
--- a/backend/manager/dbscripts/create_views.sql
+++ b/backend/manager/dbscripts/create_views.sql
@@ -1041,9 +1041,11 @@
CREATE OR REPLACE VIEW network_cluster_view
AS
SELECT network_cluster.cluster_id AS cluster_id, network_cluster.network_id AS
network_id, network.name as network_name,
- network_cluster.status as status, network_cluster.required as required,
network_cluster.is_display as is_display
+ network_cluster.status as status, network_cluster.required as required,
network_cluster.is_display as is_display,
+ vds_groups.name as cluster_name
FROM network_cluster
-INNER JOIN network ON network_cluster.network_id = network.id;
+INNER JOIN network ON network_cluster.network_id = network.id
+INNER JOIN vds_groups ON network_cluster.cluster_id = vds_groups.vds_group_id;
CREATE OR REPLACE VIEW network_view
AS
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java
index 9112f68..f3c21f4 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkClusterConditionFieldAutoCompleter.java
@@ -3,19 +3,23 @@
public class NetworkClusterConditionFieldAutoCompleter extends
BaseConditionFieldAutoCompleter {
private static final String NETWORK_NAME = "NETWORK_NAME";
+ private static final String CLUSTER_NAME = "CLUSTER_NAME";
public NetworkClusterConditionFieldAutoCompleter() {
// Building the basic verbs dict.
mVerbs.put(NETWORK_NAME, NETWORK_NAME);
+ mVerbs.put(CLUSTER_NAME, CLUSTER_NAME);
// Building the autoCompletion dict.
buildCompletions();
// Building the types dict.
getTypeDictionary().put(NETWORK_NAME, String.class);
+ getTypeDictionary().put(CLUSTER_NAME, String.class);
// building the ColumnName dict.
mColumnNameDict.put(NETWORK_NAME, "network_name");
+ mColumnNameDict.put(CLUSTER_NAME, "cluster_name");
// Building the validation dict.
buildBasicValidationTable();
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkCrossRefAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkCrossRefAutoCompleter.java
new file mode 100644
index 0000000..dda0f57
--- /dev/null
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkCrossRefAutoCompleter.java
@@ -0,0 +1,8 @@
+package org.ovirt.engine.core.searchbackend;
+
+public class NetworkCrossRefAutoCompleter extends
SearchObjectsBaseAutoCompleter {
+ public NetworkCrossRefAutoCompleter() {
+ mVerbs.put(SearchObjects.NETWORK_CLUSTER_OBJ_NAME,
SearchObjects.NETWORK_CLUSTER_OBJ_NAME);
+ buildCompletions();
+ }
+}
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
index 0ab91da..6556216 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java
@@ -112,6 +112,12 @@
SearchObjects.NETWORK_CLUSTER_OBJ_NAME,
"cluster_id");
+ // network - cluster
+ addJoin(SearchObjects.NETWORK_OBJ_NAME,
+ "id",
+ SearchObjects.NETWORK_CLUSTER_OBJ_NAME,
+ "network_id");
+
// audit - gluster volume
addJoin(SearchObjects.GLUSTER_VOLUME_OBJ_NAME, "id",
SearchObjects.AUDIT_OBJ_NAME, "gluster_volume_id");
@@ -236,7 +242,7 @@
"vm_pools_full_view",
"vm_pool_id",
"vm_pool_name ASC "));
- put(SearchObjects.NETWORK_OBJ_NAME, new
EntitySearchInfo(null,
+ put(SearchObjects.NETWORK_OBJ_NAME, new
EntitySearchInfo(new NetworkCrossRefAutoCompleter(),
new NetworkConditionFieldAutoCompleter(),
"network_view",
"network_view",
@@ -254,7 +260,8 @@
"vm_interface",
"name",
"vm_id ASC"));
- put(SearchObjects.NETWORK_CLUSTER_OBJ_NAME, new
EntitySearchInfo(null,
+ put(SearchObjects.NETWORK_CLUSTER_OBJ_NAME,
+ new EntitySearchInfo(null,
new NetworkClusterConditionFieldAutoCompleter(),
"network_cluster_view",
"network_cluster_view",
--
To view, visit http://gerrit.ovirt.org/9155
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77bc293ac47b7cc94a1d4355da2fec11649c4b47
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Muli Salem <msa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
