Alon Bar-Lev has posted comments on this change. Change subject: engine: Import single certificate ......................................................................
Patch Set 28: (13 comments) http://gerrit.ovirt.org/#/c/35485/28/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProviderCertificateChainQuery.java File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetProviderCertificateChainQuery.java: Line 45: } catch (Exception e) { Line 46: log.error("Error in encoding certificate. Error is {} " + e.getMessage()); Line 47: if (log.isDebugEnabled()) { Line 48: log.debug("", e); Line 49: } conditional not needed ^^^ just: log.debug("Exception", e); Line 50: } Line 51: } Line 52: Line 53: private CertificateInfo createCertificateInfo(X509Certificate cert) throws GeneralSecurityException { http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java File frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java: Line 361 Line 362 Line 363 Line 364 Line 365 importProviderCertificatesTitle -> importProviderCertificateTitle Line 362 Line 363 Line 364 Line 365 Line 366 import_provider_certificates -> import_provider_certificate Line 370: } Line 371: }, null, false); Line 372: } Line 373: Line 374: private ImportProviderCertificateParameters importCertificatesParams() { importCertificatesParams -> importCertificateParams Line 375: return new ImportProviderCertificateParameters(provider, certificate); Line 376: } Line 377: Line 378: private ConfirmationModel getImportCertificateConfirmationModel(CertificateInfo certInfo) { Line 402: } Line 403: Line 404: private void importCertificate() { Line 405: Frontend.getInstance().runAction(VdcActionType.ImportProviderCertificate, Line 406: importCertificatesParams(), importCertificatesParams -> importCertificateParams Line 407: new IFrontendActionAsyncCallback() { Line 408: Line 409: @Override Line 410: public void executed(FrontendActionAsyncResult result) { http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java File frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java: Line 825: @DefaultStringValue("Export Domain is not attached to any Data Center. Data can be retrieved only when the Domain is attached to a Data Center and is active") Line 826: String ExportDomainIsNotAttachedToAnyDcMsg(); Line 827: Line 828: @DefaultStringValue("The provider has the following certificates:\n") Line 829: String theProviderHasTheFollowingCertificates(); not used ^ Line 830: Line 831: @DefaultStringValue("Import provider certificates") Line 832: String importProviderCertificatesTitle(); Line 833: Line 828: @DefaultStringValue("The provider has the following certificates:\n") Line 829: String theProviderHasTheFollowingCertificates(); Line 830: Line 831: @DefaultStringValue("Import provider certificates") Line 832: String importProviderCertificatesTitle(); importProviderCertificatesTitle -> importProviderCertificateTitle Line 833: Line 834: @DefaultStringValue("There are no networks available. Please add additional networks.") Line 835: String thereAreNoNetworksAvailablePleaseAddAdditionalNetworksMsg(); Line 836: http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_de_DE.properties File frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_de_DE.properties: Line 684: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author rgromans Line 685: importNotApplicableForDefaultStorage=Die ausgew\u00E4hlte Standard-Speicherdom\u00E4ne ist nicht f\u00FCr alle Festplatten anwendbar (d.h. einige Festplatten werden auf einen anderen Storage Domain importiert). Line 686: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author Jasna Line 687: importPreConfiguredDomainTitle=Vorkonfigurierte Dom\u00E4ne importieren Line 688: importProviderCertificatesTitle=Provider-Zertifikate importieren importProviderCertificatesTitle -> importProviderCertificateTitle Line 689: # translation auto-copied from project oVirt, version master, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author Jasna Line 690: importSparseDiskToBlockDeviceMustCollapseSnapshots=Import eines d\u00FCnn provisionierten "raw" Datentr\u00E4gers aus einem Block-Device muss mit Snapshot reduzieren erfolgen Line 691: # translation auto-copied from project oVirt, version master, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author Jasna Line 692: importTemplateThatExistsInSystemMustClone=Import einer Vorlage, die im System vorhanden ist, muss im Klon-Modus importiert werden http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_es_ES.properties File frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_es_ES.properties: Line 682: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author angelagarcia Line 683: importNotApplicableForDefaultStorage=El dominio de almacenamiento predeterminado seleccionado no es aplicable para todos los discos (es decir algunos discos se importar\u00E1n a un dominio de almacenamiento diferente). Line 684: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author angelagarcia Line 685: importPreConfiguredDomainTitle=Importar dominio preconfigurado Line 686: importProviderCertificatesTitle=Importar certificados del proveedor importProviderCertificatesTitle -> importProviderCertificateTitle Line 687: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author angelagarcia Line 688: importSparseDiskToBlockDeviceMustCollapseSnapshots=La importaci\u00F3n de un disco bruto provisionado delgado de un dispositivos de bloques debe ser con colapsar la instant\u00E1nea Line 689: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author angelagarcia Line 690: importTemplateThatExistsInSystemMustClone=La importaci\u00F3n de una plantilla que existe en el sistema se tiene que realizar en el modo de clonaci\u00F3n http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_fr_FR.properties File frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_fr_FR.properties: Line 684: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author croe Line 685: importNotApplicableForDefaultStorage=La valeur du domaine de stockage par d\u00E9faut s\u00E9lectionn\u00E9 n'est pas applicable \u00E0 tous les disques (c'est-\u00E0-dire que certains disques seront export\u00E9s vers un autre domaine de stockage). Line 686: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author croe Line 687: importPreConfiguredDomainTitle=Importer Domaine pr\u00E9-configur\u00E9 Line 688: importProviderCertificatesTitle=Importer Certificats de fournisseur importProviderCertificatesTitle -> importProviderCertificateTitle Line 689: # translation auto-copied from project oVirt, version master, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author croe Line 690: importSparseDiskToBlockDeviceMustCollapseSnapshots=L'importation d'un disque RAW provisionn\u00E9 dynamique doit avoir lieu avec un snapshot r\u00E9duit. Line 691: # translation auto-copied from project oVirt, version master, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author croe Line 692: importTemplateThatExistsInSystemMustClone=L'importation d'un mod\u00E8le existant d\u00E9j\u00E0 dans le syst\u00E8me doit \u00EAtre import\u00E9 en mode clon\u00E9 http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_ja_JP.properties File frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_ja_JP.properties: Line 1196: theFieldMustContainTimeValueInvalidReason=\u3053\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u306F\u6642\u9593\u306E\u5024\u3092\u542B\u3080\u3088\u3046\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 Line 1197: theFollowingTemplatesAreMissingOnTargetExportDomainForTemplateVersionsMsg=\u4EE5\u4E0B\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u3001\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u30C9\u30E1\u30A4\u30F3\u306B\u5B58\u5728\u3057\u306A\u3044\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u30D9\u30FC\u30B9\u3068\u3057\u3066\u3044\u307E\u3059\u3002\u3053\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u3001\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C\u6A5F\u80FD\u3059\u308B\u306E\u306B\u5FC5\u8981\u3067\u3059\u3002\n\u30BF\u30FC\u30B2\u30C3\u30C8\u30C9\u30E1\u30A4\u30F3\u306B\u5BFE\u8C61\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u304B\u3001\u30AF\u30ED\u30FC\u30F3\u3092\u4F7F\u7528\u3057\u306A\u3051\u308C\u3070\u3001\u3053\u306E\u64CD\u4F5C\u3092\u5B9F\u884C\u3057\u3066\u3082\u3001\u3053\u308C\u3089\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u30A4\u30F3\u30DD\u! 30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3002\n\u64CD\u4F5C\u3092\u7D9A\u884C\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? Line 1198: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author miey Line 1199: theFollowingTemplatesAreMissingOnTargetExportDomainMsg=\u4EE5\u4E0B\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3\u306F\u3001\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u30C9\u30E1\u30A4\u30F3\u306B\u5B58\u5728\u3057\u306A\u3044\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u30D9\u30FC\u30B9\u3068\u3057\u3066\u3044\u307E\u3059\u3002\u3053\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u3001\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C\u6A5F\u80FD\u3059\u308B\u306E\u306B\u5FC5\u8981\u3067\u3059\u3002\n\u30BF\u30FC\u30B2\u30C3\u30C8\u30C9\u30E1\u30A4\u30F3\u306B\u5BFE\u8C61\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u3059\u3067\u306B\u5B58\u5728\u3057\u3066\u3044\u306A\u3044\u5834\u5408\u306B\u306F\u3001\u3053\u306E\u64CD\u4F5C\u3092\u5B9F\u884C\u3057\u3066\u3082\u3001\u3053\u308C\u3089\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3002\n\u64CD\u4F5C\u3092\u7D9A\u884C\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? Line 1200: theProviderHasTheFollowingCertificates=\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u306B\u306F\u4EE5\u4E0B\u306E\u8A3C\u660E\u66F8\u304C\u3042\u308A\u307E\u3059\u3002\n not used Line 1201: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author ykatabam Line 1202: theRelevantExportDomainIsNotActivePleaseActivateItMsg=\u5BFE\u8C61\u306E\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u30C9\u30E1\u30A4\u30F3\u306F\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u30A2\u30AF\u30C6\u30A3\u30D6\u5316\u3057\u3066\u304F\u3060\u3055\u3044\u3002 Line 1203: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author miey Line 1204: thereAreNoCompatibleStorageDomainsAttachThisDcMsg=\u3053\u306E\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u3092\u30A2\u30BF\u30C3\u30C1\u3059\u308B\u305F\u3081\u306E\u3001\u4E92\u63DB\u6027\u306E\u3042\u308B\u30B9\u30C8\u30EC\u30FC\u30B8\u30C9\u30E1\u30A4\u30F3\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u30B9\u30C8\u30EC\u30FC\u30B8\u30BF\u30D6\u304B\u3089\u65B0\u898F\u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044\u3002 http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_pt_BR.properties File frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_pt_BR.properties: Line 1270: theFollowingTemplatesAreMissingOnTargetExportDomainForTemplateVersionsMsg=As seguintes vers\u00F5es do template s\u00E3o baseadas em templates que n\u00E3o existem no export domain e s\u00E3o requeridos para a vers\u00E3o do template funcionar.\nCaso voc\u00EA proceder, voc\u00EA n\u00E3o estar\u00E1 apto a importar essas vers\u00F5es de template a n\u00E3o ser que voc\u00EA j\u00E1 tenha templates relevantes nos domains de destino ou pelo uso do clone.\nVoc\u00EA tem certeza de que deseja continuar? Line 1271: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author ldelima Line 1272: theFollowingTemplatesAreMissingOnTargetExportDomainMsg=As seguintes m\u00E1quinas virtuais s\u00E3o baseadas em templates que n\u00E3o existem no export domain e s\u00E3o requeridas para o funcionamento das m\u00E1quinas virtuais.\nCaso voc\u00EA proceder, voc\u00EA n\u00E3o estar\u00E1 apto a importar essas m\u00E1quinas virtuais a n\u00E3o ser que voc\u00EA j\u00E1 possua os template relevantes nos seus domains de destino.\nVoc\u00EA deseja continuar mesmo assim? Line 1273: # translation auto-copied from project oVirt, version ovirt-3.4, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.UIConstants, author ldelima Line 1274: theProviderHasTheFollowingCertificates=O provedor possui os seguintes certificados\:\n note used Line 1275: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author ldelima Line 1276: theRelevantExportDomainIsNotActivePleaseActivateItMsg=O Export Domain n\u00E3o est\u00E1 ativo. Por favor ative-o. Line 1277: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author ldelima Line 1278: thereAreNoCompatibleStorageDomainsAttachThisDcMsg=N\u00E3o existem Storage Domains compat\u00EDveis para anexa\u00E7\u00E3o neste Data Center. Por favor adicione um novo Storage a partir da tab Storage. http://gerrit.ovirt.org/#/c/35485/28/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_zh_CN.properties File frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_zh_CN.properties: Line 658: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author xhuang Line 659: importNotApplicableForDefaultStorage=\u6240\u9009\u7684\u9ED8\u8BA4\u5B58\u50A8\u57DF\u65E0\u6CD5\u9002\u7528\u4E8E\u6240\u6709\u78C1\u76D8\uFF08\u4E5F\u5C31\u662F\u4E00\u4E9B\u78C1\u76D8\u5C06\u88AB\u5BFC\u5165\u5230\u4E0D\u540C\u7684\u5B58\u50A8\u57DF\u91CC\uFF09\u3002 Line 660: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author xhuang Line 661: importPreConfiguredDomainTitle=\u5BFC\u5165\u9884\u914D\u7F6E\u7684\u57DF Line 662: importProviderCertificatesTitle=\u5BFC\u5165\u4F9B\u5E94\u5546\u8BC1\u4E66 importProviderCertificatesTitle -> importProviderCertificateTitle Line 663: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author xhuang Line 664: importSparseDiskToBlockDeviceMustCollapseSnapshots=\u5757\u8BBE\u5907\u7684 thin provisioned \u539F\u59CB\u78C1\u76D8\u7684\u5BFC\u5165\u5FC5\u987B\u548C Collapse \u5FEB\u7167\u5728\u4E00\u8D77 Line 665: # translation auto-copied from project oVirt, version rhevm-3.2, document frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/org.ovirt.engine.ui.uicompat.Constants, author xhuang Line 666: importTemplateThatExistsInSystemMustClone=\u5BFC\u5165\u5B58\u5728\u4E8E\u7CFB\u7EDF\u91CC\u7684\u6A21\u677F\u5FC5\u987B\u4EE5\u514B\u9686\uFF08Clone\uFF09\u6A21\u5F0F\u8FDB\u884C -- To view, visit http://gerrit.ovirt.org/35485 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic9adb21ded6e6d9fb09fc68331872c1cd88f88a9 Gerrit-PatchSet: 28 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com> Gerrit-Reviewer: Alexander Wels <aw...@redhat.com> Gerrit-Reviewer: Alon Bar-Lev <alo...@redhat.com> Gerrit-Reviewer: Daniel Erez <de...@redhat.com> Gerrit-Reviewer: Einav Cohen <eco...@redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchap...@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gsher...@redhat.com> Gerrit-Reviewer: Juan Hernandez <juan.hernan...@redhat.com> Gerrit-Reviewer: Lior Vernia <lver...@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vsz...@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzasl...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches