Change in ovirt-engine[master]: core, restapi: Convert NFS version to enum

mlipchuk at redhat.com mlipchuk at redhat.com
Wed Oct 31 12:55:56 UTC 2012


Maor Lipchuk has submitted this change and it was merged.

Change subject: core, restapi: Convert NFS version to enum
......................................................................


core, restapi: Convert NFS version to enum

In order to support optional advanced nfs options, the "auto" version
specifier must be distinct from "not set" in the database.  Instead,
"auto" will be explicit as a string, and "not set" will be null.  This
change requires the core and rest api to propagate non-numeric version
values as well.

This conversion will also help later when minor versions are specified
in the mount options, e.g. "4.1".

Bug-Url: https://bugzilla.redhat.com/871534
Change-Id: I09d82db7c0ec92135cae8935f013487e97b8f357
Signed-off-by: Greg Padgett <gpadgett at redhat.com>
---
M backend/manager/dbscripts/storages_san_sp.sql
A backend/manager/dbscripts/upgrade/03_01_1480_change_nfs_version_to_string.sql
A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NfsVersion.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_server_connections.java
M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageServerConnectionDAODbFacadeImpl.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDAOTest.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
A backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/NfsVersion.java
M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainsResource.java
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageDomainValidator.java
M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/StorageDomainMapperTest.java
M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/core/Common.gwt.xml
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
19 files changed, 214 insertions(+), 28 deletions(-)

Approvals:
  Maor Lipchuk: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I09d82db7c0ec92135cae8935f013487e97b8f357
Gerrit-PatchSet: 10
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Ayal Baron <abaron at redhat.com>
Gerrit-Reviewer: Daniel Erez <derez at redhat.com>
Gerrit-Reviewer: Eli Mesika <emesika at redhat.com>
Gerrit-Reviewer: Greg Padgett <gpadgett at redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern at redhat.com>
Gerrit-Reviewer: Ori Liel <oliel at redhat.com>



More information about the Engine-commits mailing list