Tomas Jelinek has uploaded a new change for review.
Change subject: core: reverted the rest of the blank to default rename Revert
of Ia8c91734ccd38f442c5fb8f41ff5f20c608d04e6
......................................................................
core: reverted the rest of the blank to default rename
Revert of Ia8c91734ccd38f442c5fb8f41ff5f20c608d04e6
It caused backward compatibility of REST
Change-Id: If9bcb3d910b7cdd682a29ca27eb07fd2629738d1
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
5 files changed, 18 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/39727/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
index a1606f1..a2313c8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateHandler.java
@@ -25,7 +25,7 @@
private static final Logger log =
LoggerFactory.getLogger(VmTemplateHandler.class);
protected final static Guid BLANK_VM_TEMPLATE_ID = Guid.Empty;
- protected final static String BLANK_VM_TEMPLATE_NAME = "Default";
+ protected final static String BLANK_VM_TEMPLATE_NAME = "Blank";
private static ObjectIdentityChecker mUpdateVmTemplate;
/**
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index 9bf07b6..b9bc980 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -11,7 +11,7 @@
MAC_POOL_NOT_ENOUGH_MAC_ADDRESSES=Not enough MAC addresses left in MAC Address
Pool.
ACTION_TYPE_FAILED_CANNOT_REMOVE_STILL_USED_MAC_POOL=Cannot ${action} ${type}.
Several ${entities} (${DATACENTERS_USING_MAC_POOL_COUNTER}) are using this
${type}:\n${DATACENTERS_USING_MAC_POOL}\n - Please remove it from all
${entities} that are using it and try again.
VAR__ENTITIES__DATA_CENTERS=$entities Data Centers
-ACTION_TYPE_FAILED_CANNOT_REMOVE_DEFAULT_MAC_POOL=Cannot ${action} ${type}.
Default ${type} cannot be removed.
+ACTION_TYPE_FAILED_CANNOT_REMOVE_DEFAULT_MAC_POOL=Cannot ${action} ${type}.
Blank ${type} cannot be removed.
ACTION_TYPE_FAILED_MAC_POOL_DOES_NOT_EXIST=Cannot ${action} ${type}. ${type}
does not exist.
ACTION_TYPE_FAILED_CHANGING_DEFAULT_MAC_POOL_IS_NOT_SUPPORTED=Cannot ${action}
${type}. Changing default ${type} is not supported.
ACTION_TYPE_FAILED_SETTING_DEFAULT_MAC_POOL_IS_NOT_SUPPORTED=Cannot ${action}
${type}. Setting default ${type} is not supported.
@@ -144,8 +144,8 @@
VM_POOL_CANNOT_ADD_RUNNING_VM_TO_POOL=Cannot attach VM to VM-Pool. VM is
running.
VM_INVALID_SERVER_CLUSTER_ID=Invalid Host Cluster id.
VMT_CANNOT_CREATE_TEMPLATE_FROM_DOWN_VM=Cannot ${action} ${type}. VM is locked
or still running, try again once VM is in the Down state.
-VMT_CANNOT_REMOVE_BLANK_TEMPLATE=Cannot ${action} ${type}. Removing Default
Template is not allowed.
-VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Default Template.
+VMT_CANNOT_REMOVE_BLANK_TEMPLATE=Cannot ${action} ${type}. Removing Blank
Template is not allowed.
+VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Blank Template.
VMT_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM
template.
VMT_CANNOT_UPDATE_VERSION_NAME=Cannot update the name of Sub-Templates, Only
the Version name can be updated.
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
@@ -208,7 +208,7 @@
ACTION_TYPE_FAILED_NO_AVAILABLE_POOL_VMS=Cannot ${action} ${type}. There are
no available VMs in the VM-Pool.
ACTION_TYPE_FAILED_VM_FROM_POOL_CANNOT_BE_STATELESS=Cannot ${action} ${type}.
VM from Pool cannot be stateless.
ACTION_TYPE_FAILED_PRESTARTED_VMS_CANNOT_EXCEED_VMS_COUNT=Cannot ${action}
${type}. Number of Prestarted VMs cannot exceed the number of VMs in the Pool.
-ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE=Cannot ${action} ${type}: VM was
created from the Default Template and does not contain an operating system.
Please run the VM using 'Boot from CD' or 'Boot from Network' options from the
'Run Once' menu.
+ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE=Cannot ${action} ${type}: VM was
created from the Blank Template and does not contain an operating system.
Please run the VM using 'Boot from CD' or 'Boot from Network' options from the
'Run Once' menu.
ACTION_TYPE_FAILED_DISK_SPACE_LOW=Cannot ${action} ${type}. Low disk space on
relevant Storage Domain.
ACTION_TYPE_FAILED_DISK_VOLUME_TYPE_UNSUPPORTED=Cannot ${action} ${type}. The
operation is unsupported for ${volumeType} Disk(s), please try again with
Disk(s) with one of the following type(s): ${supportedVolumeTypes}.
ACTION_TYPE_FAILED_NO_SPM=Cannot ${action} ${type}. The Data Center has no
Storage Pool Manager.
@@ -442,7 +442,7 @@
USER_DOES_NOT_HAVE_A_VALID_EMAIL=User does not have a valid e-mail address.
USB_NATIVE_SUPPORT_ONLY_AVAILABLE_ON_CLUSTER_LEVEL=Native USB support is only
available on cluster level 3.1 or higher.
USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS=Legacy USB support is not available on
Linux VMs.
-VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on
non-default Template.
+VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on non-blank
Template.
VM_POOL_CANNOT_UPDATE_POOL_NOT_FOUND=Cannot edit VM-Pool properties - VM-Pool
not found.
ACTION_TYPE_FAILED_VM_TASKS_ARE_ALREADY_RUNNING=Cannot ${action} ${type}.
There are already asynchronous running tasks, please retry later.
VM_CANNOT_SUSPENDE_HAS_RUNNING_TASKS=Cannot suspend VM. VM has asynchronous
running tasks, please retry later.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index 2d1f427..e128de9 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -373,10 +373,10 @@
@DefaultStringValue("Cannot ${action} ${type}. VM is locked or still
running, try again once VM is in the Down state.")
String VMT_CANNOT_CREATE_TEMPLATE_FROM_DOWN_VM();
- @DefaultStringValue("Cannot ${action} ${type}. Removing Default Template
is not allowed.")
+ @DefaultStringValue("Cannot ${action} ${type}. Removing Blank Template is
not allowed.")
String VMT_CANNOT_REMOVE_BLANK_TEMPLATE();
- @DefaultStringValue("Cannot export Default Template.")
+ @DefaultStringValue("Cannot export Blank Template.")
String VMT_CANNOT_EXPORT_BLANK_TEMPLATE();
@DefaultStringValue("Failed updating the properties of the VM template.")
@@ -559,7 +559,7 @@
@DefaultStringValue("Cannot ${action} ${type}. Number of Prestarted VMs
cannot exceed the number of VMs in the Pool.")
String ACTION_TYPE_FAILED_PRESTARTED_VMS_CANNOT_EXCEED_VMS_COUNT();
- @DefaultStringValue("Cannot ${action} ${type}: VM was created from the
Default Template and does not contain an operating system. Please run the VM
using 'Boot from CD' or 'Boot from Network' options from the 'Run Once' menu.")
+ @DefaultStringValue("Cannot ${action} ${type}: VM was created from the
Blank Template and does not contain an operating system. Please run the VM
using 'Boot from CD' or 'Boot from Network' options from the 'Run Once' menu.")
String ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE();
@DefaultStringValue("Cannot ${action} ${type}. Low disk space on relevant
Storage Domain.")
@@ -1258,7 +1258,7 @@
@DefaultStringValue("Legacy USB support is not available on Linux VMs.")
String USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS();
- @DefaultStringValue("VM-Pool must be based on non-default Template.")
+ @DefaultStringValue("VM-Pool must be based on non-blank Template.")
String VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE();
@DefaultStringValue("Cannot edit VM-Pool properties - VM-Pool not found.")
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 97e1f20..5f92044 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -128,8 +128,8 @@
VM_POOL_CANNOT_ADD_RUNNING_VM_TO_POOL=Cannot attach VM to VM-Pool. VM is
running.
VM_INVALID_SERVER_CLUSTER_ID=Invalid Host Cluster id.
VMT_CANNOT_CREATE_TEMPLATE_FROM_DOWN_VM=Cannot ${action} ${type}. VM is locked
or still running, try again once VM is in the Down state.
-VMT_CANNOT_REMOVE_BLANK_TEMPLATE=Cannot ${action} ${type}. Removing Default
Template is not allowed.
-VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Default Template.
+VMT_CANNOT_REMOVE_BLANK_TEMPLATE=Cannot ${action} ${type}. Removing Blank
Template is not allowed.
+VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Blank Template.
VMT_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM
template.
VMT_CANNOT_UPDATE_VERSION_NAME=Cannot update the name of Sub-Templates, Only
the Version name can be updated.
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
@@ -193,7 +193,7 @@
ACTION_TYPE_FAILED_INVALID_TIMEZONE=Cannot ${action} ${type}. Invalid time
zone for given OS type.
ACTION_TYPE_FAILED_INVALID_SERIAL_NUMBER=Cannot ${action} ${type}. Custom
serial number must be non-empty when "Custom" serial number policy is specified.
ACTION_TYPE_FAILED_PRESTARTED_VMS_CANNOT_EXCEED_VMS_COUNT=Cannot ${action}
${type}. Number of Prestarted VMs cannot exceed the number of VMs in the Pool.
-ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE=Cannot ${action} ${type}: VM was
created from the Default Template and does not contain an operating system.
Please run the VM using 'Boot from CD' or 'Boot from Network' options from the
'Run Once' menu.
+ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE=Cannot ${action} ${type}: VM was
created from the Blank Template and does not contain an operating system.
Please run the VM using 'Boot from CD' or 'Boot from Network' options from the
'Run Once' menu.
ACTION_TYPE_FAILED_DISK_SPACE_LOW=Cannot ${action} ${type}. Low disk space on
relevant Storage Domain.
ACTION_TYPE_FAILED_DISK_VOLUME_TYPE_UNSUPPORTED=Cannot ${action} ${type}. The
operation is unsupported for ${volumeType} Disk(s), please try again with
Disk(s) with one of the following type(s): ${supportedVolumeTypes}.
ACTION_TYPE_FAILED_NO_SPM=Cannot ${action} ${type}. The Data Center has no
Storage Pool Manager.
@@ -393,7 +393,7 @@
USER_DOES_NOT_HAVE_A_VALID_EMAIL=User does not have a valid e-mail address.
USB_NATIVE_SUPPORT_ONLY_AVAILABLE_ON_CLUSTER_LEVEL=Native USB support is only
available on cluster level 3.1 or higher.
USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS=Legacy USB support is not available on
Linux VMs.
-VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on
non-default Template.
+VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on non-blank
Template.
VM_POOL_CANNOT_UPDATE_POOL_NOT_FOUND=Cannot edit VM-Pool properties - VM-Pool
not found.
ACTION_TYPE_FAILED_VM_TASKS_ARE_ALREADY_RUNNING=Cannot ${action} ${type}.
There are already asynchronous running tasks, please retry later.
VM_CANNOT_SUSPENDE_HAS_RUNNING_TASKS=Cannot suspend VM. VM has asynchronous
running tasks, please retry later.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index de15003..8bc4848 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -143,8 +143,8 @@
VM_POOL_CANNOT_ADD_RUNNING_VM_TO_POOL=Cannot attach VM to VM-Pool. VM is
running.
VM_INVALID_SERVER_CLUSTER_ID=Invalid Host Cluster id.
VMT_CANNOT_CREATE_TEMPLATE_FROM_DOWN_VM=Cannot ${action} ${type}. VM is locked
or still running, try again once VM is in the Down state.
-VMT_CANNOT_REMOVE_BLANK_TEMPLATE=Cannot ${action} ${type}. Removing Default
Template is not allowed.
-VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Default Template.
+VMT_CANNOT_REMOVE_BLANK_TEMPLATE=Cannot ${action} ${type}. Removing Blank
Template is not allowed.
+VMT_CANNOT_EXPORT_BLANK_TEMPLATE=Cannot export Blank Template.
VMT_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM
template.
VMT_CANNOT_UPDATE_VERSION_NAME=Cannot update the name of Sub-Templates, Only
the Version name can be updated.
DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM=Cannot remove
Directory Group. Detach Directory Group from VM first.
@@ -205,7 +205,7 @@
ACTION_TYPE_FAILED_INVALID_TIMEZONE=Cannot ${action} ${type}. Invalid time
zone for given OS type.
ACTION_TYPE_FAILED_INVALID_SERIAL_NUMBER=Cannot ${action} ${type}. Custom
serial number must be non-empty when "Custom" serial number policy is specified.
ACTION_TYPE_FAILED_PRESTARTED_VMS_CANNOT_EXCEED_VMS_COUNT=Cannot ${action}
${type}. Number of Prestarted VMs cannot exceed the number of VMs in the Pool.
-ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE=Cannot ${action} ${type}: VM was
created from the Default Template and does not contain an operating system.
Please run the VM using 'Boot from CD' or 'Boot from Network' options from the
'Run Once' menu.
+ACTION_TYPE_FAILED_VM_WITH_BLANK_TEMPLATE=Cannot ${action} ${type}: VM was
created from the Blank Template and does not contain an operating system.
Please run the VM using 'Boot from CD' or 'Boot from Network' options from the
'Run Once' menu.
ACTION_TYPE_FAILED_DISK_SPACE_LOW=Cannot ${action} ${type}. Low disk space on
relevant Storage Domain.
ACTION_TYPE_FAILED_DISK_VOLUME_TYPE_UNSUPPORTED=Cannot ${action} ${type}. The
operation is unsupported for ${volumeType} Disk(s), please try again with
Disk(s) with one of the following type(s): ${supportedVolumeTypes}.
ACTION_TYPE_FAILED_NO_SPM=Cannot ${action} ${type}. The Data Center has no
Storage Pool Manager.
@@ -443,7 +443,7 @@
USER_DOES_NOT_HAVE_A_VALID_EMAIL=User does not have a valid e-mail address.
USB_NATIVE_SUPPORT_ONLY_AVAILABLE_ON_CLUSTER_LEVEL=Native USB support is only
available on cluster level 3.1 or higher.
USB_LEGACY_NOT_SUPPORTED_ON_LINUX_VMS=Legacy USB support is not available on
Linux VMs.
-VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on
non-default Template.
+VM_POOL_CANNOT_CREATE_FROM_BLANK_TEMPLATE=VM-Pool must be based on non-blank
Template.
VM_POOL_CANNOT_UPDATE_POOL_NOT_FOUND=Cannot edit VM-Pool properties - VM-Pool
not found.
VM_POOL_CANNOT_ATTACH_TO_MORE_VMS_FROM_POOL=User is already attached to
maximum number of VMs from this VM-Pool.
ACTION_TYPE_FAILED_VM_TASKS_ARE_ALREADY_RUNNING=Cannot ${action} ${type}.
There are already asynchronous running tasks, please retry later.
--
To view, visit https://gerrit.ovirt.org/39727
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9bcb3d910b7cdd682a29ca27eb07fd2629738d1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
