Moti Asayag has uploaded a new change for review. Change subject: webadmin: Refer to Foreman as Foreman/Satellite ......................................................................
webadmin: Refer to Foreman as Foreman/Satellite Since the administrator cannot choose to manage host by external provider, either by Foreman or by Satellite, the messages and menu options should reflect both. Change-Id: If0ba43c4e4944b484a4c72de1d554a3fb866347b Bug-Url: https://bugzilla.redhat.com/1223575 Signed-off-by: Moti Asayag <masa...@redhat.com> --- 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/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 5 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/23/41623/1 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 b653bd2..94420fe 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -648,7 +648,7 @@ ACTION_TYPE_FAILED_MIGRATION_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Migration network is not supported for this cluster version. ACTION_TYPE_FAILED_PROVIDER_DOESNT_EXIST=Cannot ${action} ${type}. The provider does not exist in the system. ACTION_TYPE_FAILED_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'OpenStack Networking'. -ACTION_TYPE_FAILED_HOST_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'External Host Provider (Foreman)'. +ACTION_TYPE_FAILED_HOST_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'External Host Provider (Foreman/Satellite)'. ACTION_TYPE_FAILED_MISSING_NETWORK_MAPPINGS=Cannot ${action} ${type}. The network mappings should be provided as a parameter or configured on the network provider. ACTION_TYPE_FAILED_MISSING_MESSAGING_BROKER_PROPERTIES=Cannot ${action} ${type}. The network provider's broker host address must be configured on the provider. ACTION_TYPE_FAILED_PROVIDER_NETWORKS_USED_MULTIPLE_TIMES=Cannot ${action} ${type}. Several external networks (${NETWORK_NAMES_COUNTER}) are being used by virtual machines and/or templates:\n${NETWORK_NAMES}\n - Please resolve the external networks usage first and try again. 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 ab111a8..902a4be 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 @@ -1795,7 +1795,7 @@ @DefaultStringValue("Cannot ${action} ${type}. The provider type should be 'OpenStack Networking'.") String ACTION_TYPE_FAILED_PROVIDER_TYPE_MISMATCH(); - @DefaultStringValue("Cannot ${action} ${type}. The provider type should be 'External Host Provider (Foreman)'.") + @DefaultStringValue("Cannot ${action} ${type}. The provider type should be 'External Host Provider (Foreman/Satellite)'.") String ACTION_TYPE_FAILED_HOST_PROVIDER_TYPE_MISMATCH(); @DefaultStringValue("Cannot ${action} ${type}. The network provider's broker host address must be configured on the provider.") diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties index b8c11cd..57f0b99 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties @@ -186,7 +186,7 @@ JobExecutionStatus___FAILED=Failed JobExecutionStatus___ABORTED=Aborted JobExecutionStatus___UNKNOWN=Unknown -ProviderType___FOREMAN=Foreman +ProviderType___FOREMAN=Foreman/Satellite ProviderType___OPENSTACK_NETWORK=OpenStack Networking OpenstackNetworkPluginType___LINUX_BRIDGE=Linux Bridge OpenstackNetworkPluginType___OPEN_VSWITCH=Open vSwitch diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index ddb6040..c3dbc06 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -626,7 +626,7 @@ @DefaultStringValue("Use JSON protocol") String hostPopupProtocolLabel(); - @DefaultStringValue("Use Foreman Hosts Providers") + @DefaultStringValue("Use Foreman/Satellite Hosts Providers") String hostPopupEnableExternalHostProvider(); @DefaultStringValue("Providers Hosts") 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 5d036ad..1d8a9c3 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 @@ -656,7 +656,7 @@ ACTION_TYPE_FAILED_MIGRATION_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Migration network is not supported for this cluster version. ACTION_TYPE_FAILED_PROVIDER_DOESNT_EXIST=Cannot ${action} ${type}. The provider does not exist in the system. ACTION_TYPE_FAILED_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'OpenStack Networking'. -ACTION_TYPE_FAILED_HOST_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'External Host Provider (Foreman)'. +ACTION_TYPE_FAILED_HOST_PROVIDER_TYPE_MISMATCH=Cannot ${action} ${type}. The provider type should be 'External Host Provider (Foreman/Satellite)'. ACTION_TYPE_FAILED_MISSING_NETWORK_MAPPINGS=Cannot ${action} ${type}. The network mappings should be provided as a parameter or configured on the network provider. ACTION_TYPE_FAILED_MISSING_MESSAGING_BROKER_PROPERTIES=Cannot ${action} ${type}. The network provider's broker host address must be configured on the provider. ACTION_TYPE_FAILED_PROVIDER_NETWORKS_USED_MULTIPLE_TIMES=Cannot ${action} ${type}. Several external networks (${NETWORK_NAMES_COUNTER}) are being used by virtual machines and/or templates:\n${NETWORK_NAMES}\n - Please resolve the external networks usage first and try again. -- To view, visit https://gerrit.ovirt.org/41623 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If0ba43c4e4944b484a4c72de1d554a3fb866347b 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
