[Engine-patches] Change in ovirt-engine[master]: restapi: Create (or not) a vnic profile when adding network

[masayag]

Moti Asayag has uploaded a new change for review.

Change subject: restapi: Create (or not) a vnic profile when adding network
......................................................................

restapi: Create (or not) a vnic profile when adding network

The patch allows the user to override the default behavior
which is creating a default vnic profile for each network
added to the system.

The user will be able to create a network without a default
vnic profile.

Change-Id: I7f21fe627935a940db1a53da68ec8d55b2fb0973
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/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java
3 files changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/17610/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 559b663..ee83be7 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
@@ -1842,6 +1842,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 name="vnic_profile_required" type="xs:boolean" 
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 e8cb990..2765222 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
@@ -2262,7 +2262,7 @@
       - mandatoryArguments: {network.data_center.id|name: 'xs:string', 
network.name: 'xs:string'}
         optionalArguments: {network.description: 'xs:string', network.comment: 
'xs:string', network.vlan.id: 'xs:string',
           network.ip.address: 'xs:string', network.ip.gateway: 'xs:string', 
network.ip.netmask: 'xs:string',
-          network.display: 'xs:boolean', network.stp: 'xs:boolean', 
network.mtu: 'xs:int'}
+          network.display: 'xs:boolean', network.stp: 'xs:boolean', 
network.mtu: 'xs:int', network.vnic_profile_required: 'xs:boolean'}
     urlparams: {}
     headers:
       Content-Type: {value: application/xml|json, required: true}
diff --git 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java
 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java
index fa32fd8..89f0085 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendNetworksResource.java
@@ -61,7 +61,14 @@
         if (namedDataCenter(network)) {
             entity.setDataCenterId(getDataCenterId(network));
         }
-        return new AddNetworkStoragePoolParameters(entity.getDataCenterId(), 
entity);
+
+        AddNetworkStoragePoolParameters parameters =
+                new AddNetworkStoragePoolParameters(entity.getDataCenterId(), 
entity);
+        if (network != null && network.isSetVnicProfileRequired()) {
+            parameters.setVnicProfileRequired(network.isVnicProfileRequired());
+        }
+
+        return parameters;
     }
 
     protected String[] getRequiredAddFields() {


-- 
To view, visit http://gerrit.ovirt.org/17610
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f21fe627935a940db1a53da68ec8d55b2fb0973
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