Yair Zaslavsky has uploaded a new change for review. Change subject: core: Add ImportCertificateCommand ......................................................................
core: Add ImportCertificateCommand Change-Id: If4308ecb184234fee3931cf4c7cfbd1796efa9d2 Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties M backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties 11 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/35780/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java index 04efd3c..5410c1f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java @@ -897,6 +897,8 @@ PROVIDER_REMOVAL_FAILED(210, AuditLogSeverity.ERROR), PROVIDER_CERTIFICATE_CHAIN_IMPORTED(211), PROVIDER_CERTIFICATE_CHAIN_IMPORT_FAILED(212, AuditLogSeverity.ERROR), + PROVIDER_CERTIFICATE_IMPORTED(213), + PROVIDER_CERTIFICATE_IMPORT_FAILED(214, AuditLogSeverity.ERROR), // General ENTITY_RENAMED(1200), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java index 18aab1c..5bdb374 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java @@ -444,6 +444,7 @@ PROVIDER_AUTHENTICATION_FAILURE(5056), PROVIDER_PROVISION_MISSING_HOSTGROUP(5057), PROVIDER_PROVISION_MISSING_COMPUTERESOURCE(5058), + PROVIDER_IMPORT_CERTIFICATE_ERROR(5059), // Network Labels LABELED_NETWORK_INTERFACE_NOT_FOUND(5200), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index b35a856..2931711 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -24,6 +24,7 @@ VAR__TYPE__LABEL, VAR__TYPE__PROVIDER, VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN, + VAR__TYPE__PROVIDER_CERTIFICATE, VAR__TYPE__VM_DISK, VAR__TYPE__BOOKMARK, VAR__TYPE__VM_TICKET, 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 e3233f7..2317670 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -281,6 +281,7 @@ VAR__TYPE__LABEL=$type Label VAR__TYPE__PROVIDER=$type provider VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain +VAR__TYPE__PROVIDER_CERTIFICATE=$type provider certificate VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines VAR__TYPE__QUOTA=$type Quota diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties index 932bd82..0ad0671 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties @@ -501,6 +501,8 @@ PROVIDER_REMOVAL_FAILED=Failed to remove provider ${ProviderName}. (User: ${UserName}) PROVIDER_CERTIFICATE_CHAIN_IMPORTED=Certificate chain for provider ${ProviderName} was imported. (User: ${UserName}) PROVIDER_CERTIFICATE_CHAIN_IMPORT_FAILED=Failed importing Certificate chain for provider ${ProviderName}. (User: ${UserName}) +PROVIDER_CERTIFICATE_IMPORTED=Certificate for provider ${ProviderName} was imported. (User: ${UserName}) +PROVIDER_CERTIFICATE_IMPORT_FAILED=Failed importing Certificate for provider ${ProviderName}. (User: ${UserName}) SUBNET_ADDED=Subnet ${SubnetName} was added on provider ${ProviderName}. (User: ${UserName}) SUBNET_ADDITION_FAILED=Failed to add subnet ${SubnetName} on provider ${ProviderName}. (User: ${UserName}) SUBNET_REMOVED=Subnet ${SubnetName} was removed from provider ${ProviderName}. (User: ${UserName}) diff --git a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties index 3fb0199..a765a81 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/VdsmErrors.properties @@ -394,6 +394,7 @@ NO_ACTIVE_ISO_DOMAIN_IN_DATA_CENTER=There is no active ISO Domain in Data Center. PROVIDER_FAILURE=Failed to communicate with the external provider. PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR=Failed to import provider certificate chain. +PROVIDER_IMPORT_CERTIFICATE_ERROR=Failed to import provider certificate. PROVIDER_SSL_FAILURE=SSL problem while trying to connect to the external provider. PROVIDER_AUTHENTICATION_FAILURE=Failed to authenticate with the external provider. Please confirm username and password. PROVIDER_PROVISION_MISSING_HOSTGROUP=Provision failure: Must choose host group to provision new host. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java index 973c1b5..e64c1be 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/VdsmErrors.java @@ -657,6 +657,8 @@ String PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR(); + String PROVIDER_IMPORT_CERTIFICATE_ERROR(); + String VM_NOT_QUALIFIED_FOR_SNAPSHOT_MERGE(); String MIGRATION_DEST_INVALID_HOSTNAME(); 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 1706555..122ee99 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 @@ -266,6 +266,7 @@ VAR__TYPE__VNIC_PROFILE=$type VM network interface profile VAR__TYPE__PROVIDER=$type provider VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain +VAR__TYPE__PROVIDER_CERTIFICATE=$type provider certificate VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines VAR__TYPE__QUOTA=$type Quota diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties index c5e9509..f93da1c 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties @@ -323,6 +323,7 @@ NO_ACTIVE_ISO_DOMAIN_IN_DATA_CENTER=There is no active ISO Domain in Data Center. PROVIDER_FAILURE=Failed to communicate with the external provider. PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR=Failed to import provider certificate chain. +PROVIDER_IMPORT_CERTIFICATE_ERROR=Failed to import provider certificate. PROVIDER_SSL_FAILURE=SSL problem while trying to connect to the external provider. PROVIDER_AUTHENTICATION_FAILURE=Failed to authenticate with the external provider. Please confirm username and passowrd. FAILED_UPDATE_RUNNING_VM=Failed to update VM while it is running, please try again when the VM is Down. 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 40585df..85b7ba5 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 @@ -279,6 +279,7 @@ VAR__TYPE__VNIC_PROFILE=$type VM network interface profile VAR__TYPE__PROVIDER=$type provider VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain +VAR__TYPE__PROVIDER_CERTIFICATE=$type provider certificate VAR__TYPE__VM=$type VM VAR__ENTITIES__VMS=$entities virtual machines VAR__TYPE__QUOTA=$type Quota diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties index 1ac7a69..f5b7c39 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors.properties @@ -323,6 +323,7 @@ NO_ACTIVE_ISO_DOMAIN_IN_DATA_CENTER=There is no active ISO Domain in Data Center. PROVIDER_FAILURE=Failed to communicate with the external provider. PROVIDER_IMPORT_CERTIFICATE_CHAIN_ERROR=Failed to import provider certificate chain. +PROVIDER_IMPORT_CERTIFICATE_ERROR=Failed to import provider certificate. PROVIDER_SSL_FAILURE=SSL problem while trying to connect to the external provider. PROVIDER_AUTHENTICATION_FAILURE=Failed to authenticate with the external provider. Please confirm username and passowrd. PROVIDER_PROVISION_MISSING_HOSTGROUP=Provision failure: Must choose host group to provision new host. -- To view, visit http://gerrit.ovirt.org/35780 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4308ecb184234fee3931cf4c7cfbd1796efa9d2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches