Change in ovirt-engine[master]: core: Static IP is set as none bootproto for cloud-init

[shavivi at redhat.com]

Shahar Havivi has submitted this change and it was merged.

Change subject: core: Static IP is set as none bootproto for cloud-init
......................................................................


core: Static IP is set as none bootproto for cloud-init

1. Setting the bootproto for static if not dhcp (was set as none)
2. Adding display name for NetworkBootProtocol enum
3. Fix CloudInitHandler for sending nulls for ip and subnet on dhcp bootproto.

Change-Id: I53159a6ead92d890f7abe2ec78196bb967994a5f
Bug-Url: https://bugzilla.redhat.com/1036013
Signed-off-by: Shahar Havivi <shaharh at redhat.com>
---
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkBootProtocol.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
3 files changed, 21 insertions(+), 6 deletions(-)

Approvals:
  Shahar Havivi: Verified; Looks good to me, approved



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I53159a6ead92d890f7abe2ec78196bb967994a5f
Gerrit-PatchSet: 7
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shavivi at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek at redhat.com>
Gerrit-Reviewer: Moti Asayag <masayag at redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel at redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server