From Denis Chaplygin <dchaplyg(a)redhat.com>:
Hello ovirt-engine-commits,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/73033
to review the following change.
Change subject: search: Add spm_id as a searchable field for Host
......................................................................
search: Add spm_id as a searchable field for Host
Required for bare metal to HE migration procedure.
Also allow to quickly map VDSM's host_id to host
in the engine.
Change-Id: I7e84dd6e39d80a4ebc78956cc1129d3ed973ed71
Bug-Url:
https://bugzilla.redhat.com/id=1417518
Signed-off-by: Denis Chaplygin <dchaplyg(a)redhat.com>
---
M
backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
A packaging/bin/engine-migrate-he.py
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/73033/1
diff --git
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
index ca08ba1..3f32c39 100644
---
a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
+++
b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/VdsConditionFieldAutoCompleter.java
@@ -32,6 +32,7 @@
public static final String TAG = "TAG";
public static final String TYPE = "TYPE";
public static final String ARCHITECTURE = "ARCHITECTURE";
+ public static final String SPM_ID = "SPM_ID";
public VdsConditionFieldAutoCompleter() {
super();
@@ -58,6 +59,7 @@
verbs.add(DATACENTER);
verbs.add(ARCHITECTURE);
verbs.add(UPDATE_AVAILABLE);
+ verbs.add(SPM_ID);
buildCompletions();
verbs.add("ID");
// Building the types dict
@@ -85,6 +87,7 @@
getTypeDictionary().put("ID", UUID.class);
getTypeDictionary().put(ARCHITECTURE, ArchitectureType.class);
getTypeDictionary().put(UPDATE_AVAILABLE, Boolean.class);
+ getTypeDictionary().put(SPM_ID, Integer.class);
// building the ColumnName Dict
columnNameDict.put(NAME, "vds_name");
columnNameDict.put(COMMENT, "free_text_comment");
@@ -110,6 +113,7 @@
columnNameDict.put("ID", "vds_id");
columnNameDict.put(ARCHITECTURE, "architecture");
columnNameDict.put(UPDATE_AVAILABLE, "is_update_available");
+ columnNameDict.put(SPM_ID, "vds_spm_id");
// Building the validation dict
buildBasicValidationTable();
}
diff --git a/packaging/bin/engine-migrate-he.py b/packaging/bin/engine-migrate-he.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packaging/bin/engine-migrate-he.py
--
To view, visit
https://gerrit.ovirt.org/73033
To unsubscribe, visit
https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e84dd6e39d80a4ebc78956cc1129d3ed973ed71
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-4.0
Gerrit-Owner: Denis Chaplygin <dchaplyg(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Juan Hernandez <juan.hernandez(a)redhat.com>
Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
Gerrit-Reviewer: ovirt-engine-commits <engine-commits(a)ovirt.org>