Dima Kuznetsov has posted comments on this change. Change subject: core: Add selinux host info to VdsDynamic ......................................................................
Patch Set 2: (4 comments) http://gerrit.ovirt.org/#/c/26955/2/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/SELinuxEnforceMode.java File backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/SELinuxEnforceMode.java: Line 3: /** Line 4: * Created by dkuznets on 4/23/14. Line 5: */ Line 6: public enum SELinuxEnforceMode { Line 7: ENFORCING("enforcing", 1), PERMISSIVE("permissive", 0), DISABLED("disabled", -1); > Please try to avoid the stringValue and the intValue, look at DiskType for I can get rid of the stringValue without any problem, but the int values are coded as they are in selinux, this allows easy conversion. Line 8: Line 9: private String stringValue; Line 10: private int intValue; Line 11: http://gerrit.ovirt.org/#/c/26955/2/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd File backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd: Line 1122: </xs:sequence> Line 1123: </xs:complexType> Line 1124: Line 1125: Line 1126: <xs:element name="selinux_enforce_modes" type="SELinuxEnforceModes" /> > I think that this should be named "selinux_modes", as it may be disabled as ok Line 1127: Line 1128: <xs:complexType name="SELinuxEnforceModes"> Line 1129: <xs:sequence> Line 1130: <xs:element name="selinux_enforce_mode" type="xs:string" minOccurs="0" maxOccurs="unbounded"> Line 1512: Line 1513: <xs:element name="selinux" type="SELinux" /> Line 1514: <xs:complexType name="SELinux"> Line 1515: <xs:sequence> Line 1516: <xs:element name="enforce_mode" type="xs:string" /> > And this should be just "mode". ok Line 1517: </xs:sequence> Line 1518: </xs:complexType> Line 1519: Line 1520: <xs:element name="host" type="Host"/> http://gerrit.ovirt.org/#/c/26955/2/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java File backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java: Line 687: return model; Line 688: } Line 689: Line 690: if (entity.getSELinuxEnforceMode() == -1) { Line 691: model.setEnforceMode("disabled"); > Instead of the string literal, try to use this: ok Line 692: } else if (entity.getSELinuxEnforceMode() == 0) { Line 693: model.setEnforceMode("permissive"); Line 694: } else if (entity.getSELinuxEnforceMode() == 1) { Line 695: model.setEnforceMode("enforcing"); -- To view, visit http://gerrit.ovirt.org/26955 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If472f68702b59280c721450d4db50dc27dc19a30 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Dima Kuznetsov <dkuzn...@redhat.com> Gerrit-Reviewer: Dima Kuznetsov <dkuzn...@redhat.com> Gerrit-Reviewer: Eli Mesika <emes...@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernan...@redhat.com> Gerrit-Reviewer: Liran Zelkha <lzel...@redhat.com> Gerrit-Reviewer: Roy Golan <rgo...@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybron...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: mooli tayer <mta...@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
