Dima Kuznetsov has uploaded a new change for review.
Change subject: core: Change SELinuxMode toString.
......................................................................
core: Change SELinuxMode toString.
SELinuxMode toString returned lowercase values, removed to names
consistent with symbols, and changed all the usages of toString to
convert to lowercase where needed.
Change-Id: I5c09dfcb89f8cdd4c75d8215693779157bf2cd8e
Signed-off-by: Dima Kuznetsov <dkuzn...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
3 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/27625/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
index e6d4a4d..610e69a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
@@ -9,10 +9,6 @@
intValue = i;
}
- public String toString() {
- return name().toLowerCase();
- }
-
public int toInt() {
return intValue;
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
index 199e8a3..caf7002 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
@@ -842,7 +842,7 @@
if (VersionUtils.greaterOrEqual(version, VERSION_3_5)) {
version.setSelinuxModes(new SELinuxModes());
for (SELinuxMode mode: values) {
-
version.getSelinuxModes().getSELinuxModes().add(mode.toString());
+
version.getSelinuxModes().getSELinuxModes().add(mode.toString().toLowerCase());
}
}
}
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
index baca9bf..d7eb8f9 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
@@ -685,7 +685,7 @@
return model;
}
- model.setMode(entity.getSELinuxEnforceMode().toString());
+ model.setMode(entity.getSELinuxEnforceMode().toString().toLowerCase());
return model;
}
--
To view, visit http://gerrit.ovirt.org/27625
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c09dfcb89f8cdd4c75d8215693779157bf2cd8e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov <dkuzn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
