Moti Asayag has uploaded a new change for review. Change subject: restapi: Associate a host with its host provider ......................................................................
restapi: Associate a host with its host provider The Host element is extended with the host external provider reference which is used to query a specific host for the available errata. Change-Id: I27668d74d2b77a9e3e282cca606503c910158f66 Bug-Url: https://bugzilla.redhat.com/1157377 Signed-off-by: Moti Asayag <masa...@redhat.com> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java 3 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/37556/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index a574291..df3a064 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -1940,6 +1940,7 @@ <xs:element name="numa_supported" type="xs:boolean" minOccurs="0" maxOccurs="1"/> <xs:element name="live_snapshot_support" type="xs:boolean" minOccurs="0" maxOccurs="1" /> <xs:element ref="katello_errata" minOccurs="0" maxOccurs="1"/> + <xs:element ref="external_host_provider" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml index 6a9ce90..572e138 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml @@ -2848,7 +2848,7 @@ host.power_management.options.option--COLLECTION: {option.name: 'xs:string', option.value: 'xs:string'}, host.power_management.pm_proxy--COLLECTION: {propietary : 'xs:string'}, host.power_management.agents.agent--COLLECTION:{type: 'xs:string', address: 'xs:string', username: 'xs:string', password: 'xs:string', options.option--COLLECTION: {option.name: 'xs:string', option.value: 'xs:string'}}, - host.power_management.kdump_detection: 'xs:boolean'} + host.power_management.kdump_detection: 'xs:boolean', host.external_host_provider.id: 'xs:string'} description: update the specified host in the system. This is deprecated and is provided only for backwards compatibility - mandatoryArguments: {} optionalArguments: {host.name: 'xs:string', host.comment: 'xs:string', host.address: 'xs:string', 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 5396c50..d7fb9ba 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 @@ -12,6 +12,7 @@ import org.ovirt.engine.api.model.Cluster; import org.ovirt.engine.api.model.CpuTopology; import org.ovirt.engine.api.model.Display; +import org.ovirt.engine.api.model.ExternalHostProvider; import org.ovirt.engine.api.model.HardwareInformation; import org.ovirt.engine.api.model.Hook; import org.ovirt.engine.api.model.Hooks; @@ -21,24 +22,24 @@ import org.ovirt.engine.api.model.HostType; import org.ovirt.engine.api.model.HostedEngine; import org.ovirt.engine.api.model.IscsiDetails; -import org.ovirt.engine.api.model.KdumpStatus; import org.ovirt.engine.api.model.KSM; +import org.ovirt.engine.api.model.KdumpStatus; import org.ovirt.engine.api.model.OperatingSystem; import org.ovirt.engine.api.model.Option; import org.ovirt.engine.api.model.Options; import org.ovirt.engine.api.model.PmProxies; import org.ovirt.engine.api.model.PmProxy; import org.ovirt.engine.api.model.PowerManagement; +import org.ovirt.engine.api.model.SELinux; import org.ovirt.engine.api.model.SELinuxMode; import org.ovirt.engine.api.model.SPM; import org.ovirt.engine.api.model.SSH; +import org.ovirt.engine.api.model.SpmState; import org.ovirt.engine.api.model.StorageManager; import org.ovirt.engine.api.model.TransparentHugePages; import org.ovirt.engine.api.model.User; import org.ovirt.engine.api.model.Version; import org.ovirt.engine.api.model.VmSummary; -import org.ovirt.engine.api.model.SELinux; -import org.ovirt.engine.api.model.SpmState; import org.ovirt.engine.api.restapi.model.AuthenticationMethod; import org.ovirt.engine.api.restapi.utils.GuidUtils; import org.ovirt.engine.core.common.action.VdsOperationActionParameters; @@ -106,6 +107,10 @@ } if (model.isSetComment()) { entity.setComment(model.getComment()); + } + if (model.isSetExternalHostProvider()) { + String providerId = model.getExternalHostProvider().getId(); + entity.setHostProviderId(providerId == null ? null : GuidUtils.asGuid(providerId)); } return entity; } @@ -288,6 +293,11 @@ model.setNumaSupported(entity.isNumaSupport()); model.setLiveSnapshotSupport(entity.getLiveSnapshotSupport()); + + if (entity.getHostProviderId() != null) { + model.setExternalHostProvider(new ExternalHostProvider()); + model.getExternalHostProvider().setId(entity.getHostProviderId().toString()); + } return model; } -- To view, visit http://gerrit.ovirt.org/37556 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I27668d74d2b77a9e3e282cca606503c910158f66 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
