Mike Kolesnik has uploaded a new change for review. Change subject: restapi: WIP Added provider to network ......................................................................
restapi: WIP Added provider to network Added provider field to network to be used on networks that are externally provided. Change-Id: Idaad66fb841a8317443d057a52d43aa67493390b Signed-off-by: Mike Kolesnik <[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/NetworkMapper.java 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/11029/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 f21ca62..34d34de 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 @@ -1695,6 +1695,7 @@ <xs:element name="mtu" type="xs:int" minOccurs="0"/> <xs:element ref="usages" minOccurs="0" maxOccurs="1"/> <xs:element name="required" type="xs:boolean" minOccurs="0"/> + <xs:element ref="provider" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java index 1657575..8e52208 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java @@ -8,6 +8,7 @@ import org.ovirt.engine.api.model.IP; import org.ovirt.engine.api.model.Network; import org.ovirt.engine.api.model.NetworkStatus; +import org.ovirt.engine.api.model.Provider; import org.ovirt.engine.api.model.Usages; import org.ovirt.engine.api.model.VLAN; import org.ovirt.engine.core.common.businessentities.network.NetworkCluster; @@ -69,6 +70,9 @@ if (model.isSetRequired()) { entity.getCluster().setRequired(model.isRequired()); } + if (model.isSetProvider() && model.getProvider().isSetId()) { + entity.setProvidedBy(new Guid(model.getProvider().getId())); + } return entity; } @@ -112,6 +116,11 @@ model.setDisplay(entity.getCluster().isDisplay()); model.setRequired(entity.getCluster().isRequired()); } + if (entity.getProvidedBy() != null) { + Provider provider = new Provider(); + provider.setId(entity.getProvidedBy().toString()); + model.setProvider(provider); + } return model; } -- To view, visit http://gerrit.ovirt.org/11029 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idaad66fb841a8317443d057a52d43aa67493390b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
