Martin Mucha has uploaded a new change for review. Change subject: restapi: introducing rest for ReportedConfigurations business entity. ......................................................................
restapi: introducing rest for ReportedConfigurations business entity. Change-Id: I2084d829cc032a015e1174a9da27478d9a95adfa Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkAttachmentMapper.java A backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ReportedConfigurationsMapper.java 3 files changed, 70 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/37875/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 1b19155..6aff4af 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 @@ -3872,6 +3872,7 @@ <xs:element ref="ip_configuration" minOccurs="0" maxOccurs="1"/> <xs:element ref="properties" minOccurs="0" maxOccurs="1"/> <xs:element name="override_configuration" type="xs:boolean" minOccurs="0" maxOccurs="1"/> + <xs:element ref="reported_configurations" minOccurs="0"/> <xs:element ref="host" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:extension> @@ -3896,18 +3897,43 @@ </xs:complexContent> </xs:complexType> + <xs:element name="reported_configurations" type="ReportedConfigurations"/> + + <xs:complexType name="ReportedConfigurations"> + <xs:sequence> + <xs:element name="in_sync" type="xs:boolean"/> + <xs:element ref="reported_configuration" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:appinfo> + <jaxb:property name="reportedConfigurations"/> + </xs:appinfo> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:element name="reported_configuration" type="ReportedConfiguration"/> + + <xs:complexType name="ReportedConfiguration"> + <xs:sequence> + <xs:element name="name" type="xs:string"/> + <xs:element name="value" type="xs:string"/> + <xs:element name="in_sync" type="xs:boolean"/> + </xs:sequence> + </xs:complexType> + <xs:element name="ip_configuration" type="IpConfiguration"/> <xs:complexType name="IpConfiguration"> - <xs:sequence> - <xs:element ref="ipv4s" minOccurs="0" maxOccurs="1"> - <xs:annotation> - <xs:appinfo> - <jaxb:property name="IPv4Configuration"/> - </xs:appinfo> - </xs:annotation> - </xs:element> - </xs:sequence> + <xs:sequence> + <xs:element ref="ipv4s" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:appinfo> + <jaxb:property name="IPv4Configuration"/> + </xs:appinfo> + </xs:annotation> + </xs:element> + </xs:sequence> </xs:complexType> <xs:element name="ipv4s" type="IPv4s"/> diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkAttachmentMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkAttachmentMapper.java index 687a7c6..7e7a6af 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkAttachmentMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkAttachmentMapper.java @@ -104,6 +104,10 @@ model.setOverrideConfiguration(entity.isOverrideConfiguration()); + if (entity.getReportedConfigurations() != null) { + model.setReportedConfigurations(ReportedConfigurationsMapper.map(entity.getReportedConfigurations(), null)); + } + IpConfiguration ipConfiguration = entity.getIpConfiguration(); if (ipConfiguration != null) { model.setIpConfiguration(new org.ovirt.engine.api.model.IpConfiguration()); diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ReportedConfigurationsMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ReportedConfigurationsMapper.java new file mode 100644 index 0000000..b848cf5 --- /dev/null +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ReportedConfigurationsMapper.java @@ -0,0 +1,31 @@ +package org.ovirt.engine.api.restapi.types; + +import java.util.List; + +import org.ovirt.engine.api.model.ReportedConfiguration; +import org.ovirt.engine.api.model.ReportedConfigurations; + +public class ReportedConfigurationsMapper { + + @Mapping(from = org.ovirt.engine.core.common.businessentities.network.ReportedConfigurations.class, to = ReportedConfigurations.class) + public static ReportedConfigurations map(org.ovirt.engine.core.common.businessentities.network.ReportedConfigurations entity, + ReportedConfigurations template) { + + ReportedConfigurations model = + template == null ? new ReportedConfigurations() : template; + + model.setInSync(entity.isNetworkInSync()); + List<ReportedConfiguration> reportedConfigurationList = model.getReportedConfigurations(); + for (org.ovirt.engine.core.common.businessentities.network.ReportedConfigurations.ReportedConfiguration reportedConfiguration : entity.getReportedConfigurationList()) { + + ReportedConfiguration conf = new ReportedConfiguration(); + conf.setInSync(reportedConfiguration.isInSync()); + conf.setName(reportedConfiguration.getType().getName()); + conf.setValue(reportedConfiguration.getValue()); + reportedConfigurationList.add(conf); + } + + + return model; + } +} -- To view, visit http://gerrit.ovirt.org/37875 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2084d829cc032a015e1174a9da27478d9a95adfa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
