diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java index 39851b47b62..bc49a53db58 100644 --- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java +++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java @@ -564,7 +564,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { } return answer; } catch (Exception e) { - s_logger.debug("copy snasphot failed: " + e.toString()); + s_logger.debug("copy snasphot failed: ", e); if (cacheData != null) { cacheMgr.deleteCacheObject(cacheData); } diff --git a/test/integration/component/test_configdrive.py b/test/integration/component/test_configdrive.py index 17ac3ae9281..c8ed337b06e 100644 --- a/test/integration/component/test_configdrive.py +++ b/test/integration/component/test_configdrive.py @@ -1871,10 +1871,6 @@ class TestConfigDrive(cloudstackTestCase, ConfigDriveUtils): self.then_config_drive_is_as_expected(vm1, public_ip_1, metadata=True) # ===================================================================== - # Nuage -- - # Update offering to VR - # ===================================================================== - self.debug("+++ Scenario: " "update userdata and reset password after reboot") vm1.reboot(self.api_client) diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py index 1b2a979d443..1c5cf27128a 100644 --- a/tools/apidoc/gen_toc.py +++ b/tools/apidoc/gen_toc.py @@ -87,8 +87,6 @@ known_categories = { 'OpenDaylight': 'Network', 'createServiceInstance': 'Network', 'addGloboDnsHost': 'Network', - 'listnuagevspdomaintemplates': 'Network', - 'listnuagevspglobaldomaintemplate': 'Network', 'Vpn': 'VPN', 'Limit': 'Limit', 'ResourceCount': 'Limit', @@ -140,7 +138,6 @@ known_categories = { 'NiciraNvpDevice': 'Nicira NVP', 'BrocadeVcsDevice': 'Brocade VCS', 'BigSwitchBcfDevice': 'BigSwitch BCF', - 'NuageVsp': 'Nuage VSP', 'AutoScale': 'AutoScale', 'Counter': 'AutoScale', 'Condition': 'AutoScale', diff --git a/ui/l10n/ar.js b/ui/l10n/ar.js index 87c119306be..55622b2e986 100644 --- a/ui/l10n/ar.js +++ b/ui/l10n/ar.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Add F5 device", "label.add.LDAP.account": "Add LDAP Account", "label.add.NiciraNvp.device": "Add Nvp Controller", - "label.add.NuageVsp.device": "Add Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Add OpenDaylight Controller", "label.add.PA.device": "Add Palo Alto device", "label.add.SRX.device": "Add SRX device", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Delete F5", "label.delete.NetScaler": "Delete NetScaler", "label.delete.NiciraNvp": "Remove Nvp Controller", - "label.delete.NuageVsp": "Remove Nuage VSD", "label.delete.OpenDaylight.device": "Delete OpenDaylight Controller", "label.delete.PA": "Delete Palo Alto", "label.delete.SRX": "Delete SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "الرجاء تعبئة البيانات التالية لإضافة نظام جديد لطرح", "message.add.template": "Please enter the following data to create your new template", "message.add.volume": "Please fill in the following data to add a new volume.", - "message.added.new.nuage.vsp.controller": "Added new Nuage Vsp Controller", "message.added.vpc.offering": "Added VPC offering", "message.adding.Netscaler.device": "Adding Netscaler device", "message.adding.Netscaler.provider": "Adding Netscaler provider", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Please confirm that you would like to delete Brocade Vcs Switch", "message.confirm.delete.F5": "Please confirm that you would like to delete F5", "message.confirm.delete.NetScaler": "Please confirm that you would like to delete NetScaler", - "message.confirm.delete.NuageVsp": "Please confirm that you would like to delete Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Please confirm that you would like to delete Palo Alto", "message.confirm.delete.SRX": "Please confirm that you would like to delete SRX", "message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?", diff --git a/ui/l10n/ca.js b/ui/l10n/ca.js index 25803012283..0c55524141d 100644 --- a/ui/l10n/ca.js +++ b/ui/l10n/ca.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Add F5 device", "label.add.LDAP.account": "Add LDAP Account", "label.add.NiciraNvp.device": "Add Nvp Controller", - "label.add.NuageVsp.device": "Add Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Add OpenDaylight Controller", "label.add.PA.device": "Add Palo Alto device", "label.add.SRX.device": "Add SRX device", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Esborrar F5", "label.delete.NetScaler": "Esborrar NetScaler", "label.delete.NiciraNvp": "Remove Nvp Controller", - "label.delete.NuageVsp": "Remove Nuage VSD", "label.delete.OpenDaylight.device": "Delete OpenDaylight Controller", "label.delete.PA": "Delete Palo Alto", "label.delete.SRX": "Esborar SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Please fill in the following data to add a new system service offering.", "message.add.template": "Please enter the following data to create your new template", "message.add.volume": "Please fill in the following data to add a new volume.", - "message.added.new.nuage.vsp.controller": "Added new Nuage Vsp Controller", "message.added.vpc.offering": "Added VPC offering", "message.adding.Netscaler.device": "Adding Netscaler device", "message.adding.Netscaler.provider": "Adding Netscaler provider", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Please confirm that you would like to delete Brocade Vcs Switch", "message.confirm.delete.F5": "Si us plau confirmeu que voleu esborrar l'F5", "message.confirm.delete.NetScaler": "Si us plau confirmeu que voleu esborrar el NetScaler", - "message.confirm.delete.NuageVsp": "Please confirm that you would like to delete Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Please confirm that you would like to delete Palo Alto", "message.confirm.delete.SRX": "Si us plau confirmeu que voleu esborrar l'SRX", "message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?", diff --git a/ui/l10n/de_DE.js b/ui/l10n/de_DE.js index 13e96b58a6f..ca1344b87b7 100644 --- a/ui/l10n/de_DE.js +++ b/ui/l10n/de_DE.js @@ -308,7 +308,6 @@ var dictionary = { "label.add.F5.device": "F5-Gerät hinzufügen", "label.add.LDAP.account": "LDAP-Konto hinzufügen", "label.add.NiciraNvp.device": "Nvp Controller hinzufügen", - "label.add.NuageVsp.device": "Nuage Virtualized Services Directory (VSD) hinzufügen", "label.add.OpenDaylight.device": "OpenDaylight Controller hinzufügen", "label.add.PA.device": "Palo Alto-Gerät hinzufügen", "label.add.SRX.device": "SRX-Gerät hinzufügen", @@ -605,7 +604,6 @@ var dictionary = { "label.delete.F5": "F5 löschen", "label.delete.NetScaler": "Lösche NetScaler", "label.delete.NiciraNvp": "Entferne Nvp Controller", - "label.delete.NuageVsp": "Nuage VSD entfernen", "label.delete.OpenDaylight.device": "OpenDaylight Controller löschen", "label.delete.PA": "Palo Alto löschen", "label.delete.SRX": "SRX löschen", @@ -1919,7 +1917,6 @@ var dictionary = { "message.add.system.service.offering": "Bitte geben Sie die folgenden Daten ein, um ein neues Systemdienstangebot hinzuzufügen.", "message.add.template": "Bitte geben Sie die folgende Daten ein, um Ihre neue Vorlage zu erstellen", "message.add.volume": "Bitte geben Sie die folgende Daten ein, um ein neues Volumen hinzuzufügen.", - "message.added.new.nuage.vsp.controller": "Neuer Nicira Vsp Controller hinzugefügt", "message.added.vpc.offering": "VPC-Angebot hinzugefügt", "message.adding.Netscaler.device": "Hinzufügen eines Netscaler Gerätes", "message.adding.Netscaler.provider": "Hinzufügen eines Netscaler Provider", @@ -1968,7 +1965,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Bitte bestätigen Sie, dass Sie Brocade Vcs Switch löschen möchten", "message.confirm.delete.F5": "Bitte bestätigen Sie, dass Sie F5 löschen möchten", "message.confirm.delete.NetScaler": "Bitte bestätigen Sie, dass Sie NetScaler löschen möchten", - "message.confirm.delete.NuageVsp": "Bitte bestätigen Sie, dass Sie das Nuage Virtulazierte Dienste Verzeichnis löschen möchten", "message.confirm.delete.PA": "Bitte bestätigen Sie, dass Sie Palo Alto löschen möchten", "message.confirm.delete.SRX": "Bitte bestätigen Sie, dass Sie SRX löschen möchten", "message.confirm.delete.acl.list": "Sind Sie sicher, dass Sie diese ACL-Liste löschen möchten?", diff --git a/ui/l10n/es.js b/ui/l10n/es.js index 610c62eeeea..a7af4e9c539 100644 --- a/ui/l10n/es.js +++ b/ui/l10n/es.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Agregar dispositivo F5", "label.add.LDAP.account": "Agregar Cuenta LDAP", "label.add.NiciraNvp.device": "Agregar Controlador Nvp", - "label.add.NuageVsp.device": "Agregar Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Agregar el Controlador OpenDaylight", "label.add.PA.device": "Agregar dispositivo Palo Alto", "label.add.SRX.device": "Agregar dispositivo SRX", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Borrar F5", "label.delete.NetScaler": "Borrar NetScaler", "label.delete.NiciraNvp": "Quitar Controlado Nvp", - "label.delete.NuageVsp": "Quitar Nuage VSD", "label.delete.OpenDaylight.device": "Borrar el Controlador OpenDaylight", "label.delete.PA": "Borrar Palo Alto", "label.delete.SRX": "Borrar SRX", @@ -1917,7 +1915,6 @@ var dictionary = { "message.add.system.service.offering": "Por favor complete los siguientes datos para agregar un nueva oferta de servicio de sistema.", "message.add.template": "Por favor ingrese los siguientes datos para crear la nueva plantilla", "message.add.volume": "Por favor, rellene los siguientes datos para agregar un nuevo volumen.", - "message.added.new.nuage.vsp.controller": "Nuevo Controlador Nuage Vsp agregado", "message.added.vpc.offering": "Oferta VPC agregada", "message.adding.Netscaler.device": "Agregando un dispositivo NetScaler", "message.adding.Netscaler.provider": "Agregando un proveedor NetScaler", @@ -1966,7 +1963,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Por favor confirme que desa borrar este Switch Brocade Vcs", "message.confirm.delete.F5": "Por favor confirme que quiere eliminar el F5", "message.confirm.delete.NetScaler": "Por favo confirme que desa borrar este NetScaler", - "message.confirm.delete.NuageVsp": "Por favo confirme que desa borrar este Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Por favor confirme que desa borrar este Palo Alto", "message.confirm.delete.SRX": "Por favor confirme que desa borrar este SRX", "message.confirm.delete.acl.list": "¿Esta seguro que desea borrar esta lista de ACL?", diff --git a/ui/l10n/fr_FR.js b/ui/l10n/fr_FR.js index 88b6cad21b7..74912f0715e 100644 --- a/ui/l10n/fr_FR.js +++ b/ui/l10n/fr_FR.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Ajouter un F5", "label.add.LDAP.account": "Ajouter Compte LDAP", "label.add.NiciraNvp.device": "Ajouter un contrôleur Nvp", - "label.add.NuageVsp.device": "Ajouter Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Ajouter contrôleur OpenDaylight", "label.add.PA.device": "Ajouter périphérique Palo Alto", "label.add.SRX.device": "Ajouter un SRX", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Supprimer F5", "label.delete.NetScaler": "Supprimer Netscaler", "label.delete.NiciraNvp": "Supprimer un contrôleur Nvp", - "label.delete.NuageVsp": "Supprimer Nuage VSD", "label.delete.OpenDaylight.device": "Supprimer contrôleur OpenDaylight", "label.delete.PA": "Supprimer Palo Alto", "label.delete.SRX": "Supprimer SRX", @@ -1918,7 +1916,6 @@ var dictionary = { "message.add.system.service.offering": "Ajouter les informations suivantes pour créer une nouvelle offre de système.", "message.add.template": "Renseignez les informations suivantes pour créer votre nouveau modèle", "message.add.volume": "Renseignez les informations suivantes pour ajouter un nouveau volume", - "message.added.new.nuage.vsp.controller": "Ajout d'un nouveau contrôleur Nuage Vsp", "message.added.vpc.offering": "Offre de VPC ajoutée", "message.adding.Netscaler.device": "Ajouter un Netscaler", "message.adding.Netscaler.provider": "Ajouter un fournisseur Netscaler", @@ -1967,7 +1964,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Confirmer la suppression du switch Brocade Vcs", "message.confirm.delete.F5": "Confirmer la suppression du F5", "message.confirm.delete.NetScaler": "Confirmer la suppression du Netscaler", - "message.confirm.delete.NuageVsp": "Confirmer la suppression du Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Confirmer la suppression du Palo Alto", "message.confirm.delete.SRX": "Confirmer la suppression du SRX", "message.confirm.delete.acl.list": "Confirmer la suppression de cette liste ACL ?", diff --git a/ui/l10n/hu.js b/ui/l10n/hu.js index 2ed1f348c77..b077d7bdb7a 100644 --- a/ui/l10n/hu.js +++ b/ui/l10n/hu.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "F5 eszköz felvétele", "label.add.LDAP.account": "LDAP számla felvétele", "label.add.NiciraNvp.device": "Nvp Controller felvétele", - "label.add.NuageVsp.device": "Nuage Virtualized Services Directory (VSD) felvétele", "label.add.OpenDaylight.device": "OpenDaylight Controller hozzáadása", "label.add.PA.device": "Palo Alto eszköz felvétele", "label.add.SRX.device": "SRX szköz felvétele", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "F5 törlése", "label.delete.NetScaler": "NetScaler törlése", "label.delete.NiciraNvp": "Nvp vezérlő törlése", - "label.delete.NuageVsp": "Nuage VSD törlése", "label.delete.OpenDaylight.device": "OpenDaylight Controller törlése", "label.delete.PA": "Palo Alto törlése", "label.delete.SRX": "SRX törlése", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Töltsd ki a következő adatokat új rendszer szolgáltatás ajánlat felvételéhez", "message.add.template": "Add meg a következő adatokat új sablon létrehozásához", "message.add.volume": "Töltsd ki a következő adatokat új kötet létrehozásához", - "message.added.new.nuage.vsp.controller": "Új Nicira Vsp vezérlő felvéve", "message.added.vpc.offering": "VPC ajánlat felvéve", "message.adding.Netscaler.device": "Netscaler eszköz felvétele", "message.adding.Netscaler.provider": "Netscaler szolgáltató felvétele", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Erősítsd meg, hogy törölni szeretnéd a Brocade Vcs Switch-et", "message.confirm.delete.F5": "Erősítsd meg, hogy törölni szeretnéd az F5-öt", "message.confirm.delete.NetScaler": "Erősítsd meg, hogy törölni szeretnéd a NetScaler-t", - "message.confirm.delete.NuageVsp": "Erősítsd meg, hogy törölni szeretnéd a Muage Virtualized Services Directory-t", "message.confirm.delete.PA": "Erősítsd meg, hogy törölni szeretnéd a Palo Alto-t", "message.confirm.delete.SRX": "Erősítsd meg, hogy törölni szeretnéd a SRX-et", "message.confirm.delete.acl.list": "Biztosan törölni akarod ezt a ACL listát?", diff --git a/ui/l10n/it_IT.js b/ui/l10n/it_IT.js index c2210ca3ad4..cd7b767bef7 100644 --- a/ui/l10n/it_IT.js +++ b/ui/l10n/it_IT.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Aggiungere device F5", "label.add.LDAP.account": "Add LDAP Account", "label.add.NiciraNvp.device": "Aggiungere Controller Nvp", - "label.add.NuageVsp.device": "Add Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Add OpenDaylight Controller", "label.add.PA.device": "Aggiungere un device Palo Alto", "label.add.SRX.device": "Aggiungere device SRX", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Rimozione F5", "label.delete.NetScaler": "Rimozione NetScaler", "label.delete.NiciraNvp": "Rimuovere Controller Nvp", - "label.delete.NuageVsp": "Remove Nuage VSD", "label.delete.OpenDaylight.device": "Delete OpenDaylight Controller", "label.delete.PA": "Cancellare Palo Alto", "label.delete.SRX": "Rimozione SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Si prega di inserire le seguenti informazioni per aggiungere una nuova offerta di servizio di sistema.", "message.add.template": "Please enter the following data to create your new template", "message.add.volume": "Please fill in the following data to add a new volume.", - "message.added.new.nuage.vsp.controller": "Added new Nuage Vsp Controller", "message.added.vpc.offering": "Added VPC offering", "message.adding.Netscaler.device": "Aggiunta di dispositivo Netscaler", "message.adding.Netscaler.provider": "Aggiunta di un provider Netscaler", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Please confirm that you would like to delete Brocade Vcs Switch", "message.confirm.delete.F5": "Si prega di confermare di voler rimuovere F5", "message.confirm.delete.NetScaler": "Si prega di confermare di voler rimuovere NetScaler", - "message.confirm.delete.NuageVsp": "Please confirm that you would like to delete Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Please confirm that you would like to delete Palo Alto", "message.confirm.delete.SRX": "Si prega di confermare di voler rimuovere SRX", "message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?", diff --git a/ui/l10n/ja_JP.js b/ui/l10n/ja_JP.js index db94ca88743..225e5c5cc6f 100644 --- a/ui/l10n/ja_JP.js +++ b/ui/l10n/ja_JP.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "F5 デバイスの追加", "label.add.LDAP.account": "LDAP アカウントの追加", "label.add.NiciraNvp.device": "NVP Controller の追加", - "label.add.NuageVsp.device": "Nuage Virtualized Services Directory (VSD) の追加", "label.add.OpenDaylight.device": "OpenDaylight コントローラーの追加", "label.add.PA.device": "Palo Alto デバイスの追加", "label.add.SRX.device": "SRX デバイスの追加", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "F5 の削除", "label.delete.NetScaler": "NetScaler の削除", "label.delete.NiciraNvp": "NVP Controller の削除", - "label.delete.NuageVsp": "Nuage VSD の削除", "label.delete.OpenDaylight.device": "OpenDaylight コントローラーの削除", "label.delete.PA": "Palo Alto の削除", "label.delete.SRX": "SRX の削除", @@ -1918,7 +1916,6 @@ var dictionary = { "message.add.system.service.offering": "新しいシステム サービス オファリングを追加するために、次のデータを入力してください。", "message.add.template": "新しいテンプレートを作成するために、次のデータを入力してください。", "message.add.volume": "新しいボリュームを追加するために、次のデータを入力してください。", - "message.added.new.nuage.vsp.controller": "新しい Nuage VSP コントローラーを追加しました", "message.added.vpc.offering": "VPC オファリングを追加しました", "message.adding.Netscaler.device": "NetScaler デバイスを追加しています", "message.adding.Netscaler.provider": "NetScaler プロバイダーを追加しています", @@ -1967,7 +1964,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Brocade VCS スイッチを削除してもよろしいですか?", "message.confirm.delete.F5": "F5 を削除してもよろしいですか?", "message.confirm.delete.NetScaler": "NetScaler を削除してもよろしいですか?", - "message.confirm.delete.NuageVsp": "Nuage Virtualized Services Directory を削除してもよろしいですか?", "message.confirm.delete.PA": "Palo Alto を削除してもよろしいですか?", "message.confirm.delete.SRX": "SRX を削除してもよろしいですか?", "message.confirm.delete.acl.list": "この ACL 一覧を削除してもよろしいですか?", diff --git a/ui/l10n/ko_KR.js b/ui/l10n/ko_KR.js index 52cd1831a4f..dd3de7e62d1 100644 --- a/ui/l10n/ko_KR.js +++ b/ui/l10n/ko_KR.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "F5 기기 추가", "label.add.LDAP.account": "Add LDAP Account", "label.add.NiciraNvp.device": "Nvp 콘트롤러", - "label.add.NuageVsp.device": "Add Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Add OpenDaylight Controller", "label.add.PA.device": "Add Palo Alto device", "label.add.SRX.device": "SRX 기기 추가", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "F5 삭제", "label.delete.NetScaler": "NetScaler 삭제", "label.delete.NiciraNvp": "Remove Nvp Controller", - "label.delete.NuageVsp": "Remove Nuage VSD", "label.delete.OpenDaylight.device": "Delete OpenDaylight Controller", "label.delete.PA": "Delete Palo Alto", "label.delete.SRX": "SRX 삭제", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "새로운 시스템 서비스 제공을 추가하기 위해 다음 데이터를 입력해 주십시오.", "message.add.template": "새로운 템플릿을 만들기하기 위해 아래 데이터를 입력해 주십시오.", "message.add.volume": "새로운 볼륨을 추가하기 위해 아래 데이터를 입력해 주십시오.", - "message.added.new.nuage.vsp.controller": "Added new Nuage Vsp Controller", "message.added.vpc.offering": "Added VPC offering", "message.adding.Netscaler.device": "Netscaler 기기를 추가하고 있습니다", "message.adding.Netscaler.provider": "Netscaler 제공자를 추가하고 있습니다.", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Please confirm that you would like to delete Brocade Vcs Switch", "message.confirm.delete.F5": "F5를 삭제하시겠습니까?", "message.confirm.delete.NetScaler": "NetScaler를 삭제하시겠습니까?", - "message.confirm.delete.NuageVsp": "Please confirm that you would like to delete Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Please confirm that you would like to delete Palo Alto", "message.confirm.delete.SRX": "SRX를 삭제하시겠습니까?", "message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?", diff --git a/ui/l10n/nb_NO.js b/ui/l10n/nb_NO.js index fbe3bbaa374..98592cba825 100644 --- a/ui/l10n/nb_NO.js +++ b/ui/l10n/nb_NO.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Legg til F5 enhet", "label.add.LDAP.account": "Legg til LDAP-konto", "label.add.NiciraNvp.device": "Legg til Nvp kontroller", - "label.add.NuageVsp.device": "Legg til Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Legg til OpenDayLight kontroller", "label.add.PA.device": "Legg til Palo Alto enhet", "label.add.SRX.device": "Legg til SRX enhet", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Slett F5", "label.delete.NetScaler": "Slett Netscaler", "label.delete.NiciraNvp": "Fjern Nvp-kontroller", - "label.delete.NuageVsp": "Fjern Nuage VSD", "label.delete.OpenDaylight.device": "Fjern OpenDaylight kontroller", "label.delete.PA": "Slett Palo Alto", "label.delete.SRX": "Slett SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Vennligst skriv inn følgende data for å legge til et nytt systemtjenestetilbud.", "message.add.template": "Vennligst skriv inn følgende data for å opprette din nye mal", "message.add.volume": "Vennligst skriv inn følgende data for å legge til et nytt volum.", - "message.added.new.nuage.vsp.controller": "La til ny Nuage Vsp-kontroller", "message.added.vpc.offering": "La til VPC tilbud", "message.adding.Netscaler.device": "Legg til NetScaler-enhet", "message.adding.Netscaler.provider": "Legger til Netscaler tilbyder", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Vennligst bekreft at du vil slette denne Brocade Vcs svitsjen", "message.confirm.delete.F5": "Vennligst bekreft at du ønsker å slette F5", "message.confirm.delete.NetScaler": "Vennligst bekreft at du ønsker å slette Netscaler", - "message.confirm.delete.NuageVsp": "Vennligst bekreft at du ønsker å slette Nuage Virtualized Service Directory", "message.confirm.delete.PA": "Vennligst bekreft at du vil slette Palo Alto", "message.confirm.delete.SRX": "Vennligst bekreft at du ønsker å slette SRX", "message.confirm.delete.acl.list": "Er du sikker på at du ønsker å slette denne ACL listen?", diff --git a/ui/l10n/nl_NL.js b/ui/l10n/nl_NL.js index d1a96daa01b..882598b2d4d 100644 --- a/ui/l10n/nl_NL.js +++ b/ui/l10n/nl_NL.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Voeg F5 apparaat toe", "label.add.LDAP.account": "voeg LDAP rekening toe", "label.add.NiciraNvp.device": "Voeg NVP Controller toe", - "label.add.NuageVsp.device": "Voeg Nuage Virtualized Services Directory (VSD) toe", "label.add.OpenDaylight.device": "OpenDaylight Controller toevoegen", "label.add.PA.device": "Nieuw Palo Alto apparaat toevoegen", "label.add.SRX.device": "SRX apparaat toevoegen", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Verwijder F5", "label.delete.NetScaler": "Verwijder NetScaler", "label.delete.NiciraNvp": "Verwijder Nvp Controller", - "label.delete.NuageVsp": "Verwijder Nuage VSD", "label.delete.OpenDaylight.device": "OpenDaylight Controller verwijderen", "label.delete.PA": "Verwijder Palo Alto", "label.delete.SRX": "Verwijder SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Specificeer de volgende gegevens om een nieuwe systeem aanbieding toe te voegen.", "message.add.template": "Specificeer de volgende gegevens om een nieuwe template aan te maken", "message.add.volume": "Specificeer de volgende gegevens om een nieuw volume toe te voegen.", - "message.added.new.nuage.vsp.controller": "nieuwe Nuage Vsp Controller toegevoegd", "message.added.vpc.offering": "VPC aanbieding toegevoegd", "message.adding.Netscaler.device": "Netscaler toevoegen", "message.adding.Netscaler.provider": "Netscaler provider toevoegen", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "bevestigd dat Brocade Vcs Switch wilt verwijderen, altublieft", "message.confirm.delete.F5": "Bevestig dat u deze F5 wilt verwijderen", "message.confirm.delete.NetScaler": "Bevestig dat u deze NetScaler wilt verwijderen", - "message.confirm.delete.NuageVsp": "bevestig dat u Nuage Virtualized Services Directory wilt verwijderen, alstublieft", "message.confirm.delete.PA": "Bevestig dat u Palo Alto wilt verwijderen", "message.confirm.delete.SRX": "Bevestig dat u deze SRX wilt verwijderen", "message.confirm.delete.acl.list": "Weet U zeker dat U dit ACL wilt verwijderen?", diff --git a/ui/l10n/pl.js b/ui/l10n/pl.js index ccac03c3f0c..ec3daccc3a8 100644 --- a/ui/l10n/pl.js +++ b/ui/l10n/pl.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Add F5 device", "label.add.LDAP.account": "Add LDAP Account", "label.add.NiciraNvp.device": "Add Nvp Controller", - "label.add.NuageVsp.device": "Add Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Add OpenDaylight Controller", "label.add.PA.device": "Add Palo Alto device", "label.add.SRX.device": "Add SRX device", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Usuń F5", "label.delete.NetScaler": "Delete NetScaler", "label.delete.NiciraNvp": "Remove Nvp Controller", - "label.delete.NuageVsp": "Remove Nuage VSD", "label.delete.OpenDaylight.device": "Delete OpenDaylight Controller", "label.delete.PA": "Delete Palo Alto", "label.delete.SRX": "Usuń SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Please fill in the following data to add a new system service offering.", "message.add.template": "Please enter the following data to create your new template", "message.add.volume": "Please fill in the following data to add a new volume.", - "message.added.new.nuage.vsp.controller": "Added new Nuage Vsp Controller", "message.added.vpc.offering": "Added VPC offering", "message.adding.Netscaler.device": "Adding Netscaler device", "message.adding.Netscaler.provider": "Adding Netscaler provider", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Please confirm that you would like to delete Brocade Vcs Switch", "message.confirm.delete.F5": "Czy na pewno chcesz usunąć F5?", "message.confirm.delete.NetScaler": "Please confirm that you would like to delete NetScaler", - "message.confirm.delete.NuageVsp": "Please confirm that you would like to delete Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Please confirm that you would like to delete Palo Alto", "message.confirm.delete.SRX": "Czy na pewno chcesz usunąć SRX?", "message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?", diff --git a/ui/l10n/pt_BR.js b/ui/l10n/pt_BR.js index 06b8553115f..43f7252bf22 100644 --- a/ui/l10n/pt_BR.js +++ b/ui/l10n/pt_BR.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Adicionar dispositivo F5", "label.add.LDAP.account": "Adicionar Conta LDAP", "label.add.NiciraNvp.device": "Adicionar Controlador Nvp", - "label.add.NuageVsp.device": "Adicionar Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Adiciona Controlador OpenDaylight", "label.add.PA.device": "Adicionar dispositivo Palo Alto", "label.add.SRX.device": "Adicionar dispositivo SRX", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Remover F5", "label.delete.NetScaler": "Remover NetScaler", "label.delete.NiciraNvp": "Remover Controlador Nvp", - "label.delete.NuageVsp": "Remover Nuage VSD", "label.delete.OpenDaylight.device": "Apaga Controladora OpenDaylight", "label.delete.PA": "Remover Palo Alto", "label.delete.SRX": "Remover SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Por favor preencha os dados abaixo para adicionar uma nova oferta de serviço de sistema.", "message.add.template": "Entre com os dados para criar um novo template.", "message.add.volume": "Entre com os dados para criar um novo disco.", - "message.added.new.nuage.vsp.controller": "Adicionada nova Controladora Nuage Vsp", "message.added.vpc.offering": "Adicionada oferta VPC", "message.adding.Netscaler.device": "Adicionando dispositivo Nescaler", "message.adding.Netscaler.provider": "Adicionando Netscaler provider", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Por favor confirme que você deseja remover o Brocade Vcs Switch", "message.confirm.delete.F5": "Por favor confirme que você deseja remover o F5", "message.confirm.delete.NetScaler": "Por favor confirme que você deseja remover o NetScaler", - "message.confirm.delete.NuageVsp": "Por favor confirme que você deseja remover o", "message.confirm.delete.PA": "Por favor, confirme que você deseja remover Palo Alto", "message.confirm.delete.SRX": "Por favor confirme que você deseja remover o SRX", "message.confirm.delete.acl.list": "Você tem certeza que deseja apagar esta lista ACL?", diff --git a/ui/l10n/ru_RU.js b/ui/l10n/ru_RU.js index a61fe1ea5ef..d20117505cb 100644 --- a/ui/l10n/ru_RU.js +++ b/ui/l10n/ru_RU.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "Добавить F5 устройво", "label.add.LDAP.account": "Add LDAP Account", "label.add.NiciraNvp.device": "Добавить контроллер Nvp", - "label.add.NuageVsp.device": "Add Nuage Virtualized Services Directory (VSD)", "label.add.OpenDaylight.device": "Add OpenDaylight Controller", "label.add.PA.device": "Добавить устройство Palo Alto", "label.add.SRX.device": "Добавить SRX устройство", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "Удалить F5", "label.delete.NetScaler": "Удалить NetScaler", "label.delete.NiciraNvp": "Удалить Nvp контроллер", - "label.delete.NuageVsp": "Remove Nuage VSD", "label.delete.OpenDaylight.device": "Delete OpenDaylight Controller", "label.delete.PA": "Удалить Palo Alto", "label.delete.SRX": "Удалить SRX", @@ -1916,7 +1914,6 @@ var dictionary = { "message.add.system.service.offering": "Пожалуйста заполните следующие параметры для добавления новой сервисной услуги", "message.add.template": "Пожалуйста введите следующие данные для создания нового шаблона", "message.add.volume": "Пожалуйста введите следующие данные для добавления нового диска.", - "message.added.new.nuage.vsp.controller": "Added new Nuage Vsp Controller", "message.added.vpc.offering": "Added VPC offering", "message.adding.Netscaler.device": "Добавление устройства NetScaler", "message.adding.Netscaler.provider": "Добавить Netscaler", @@ -1965,7 +1962,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "Please confirm that you would like to delete Brocade Vcs Switch", "message.confirm.delete.F5": "Подтвердите, что вы действительно хотите удалить F5", "message.confirm.delete.NetScaler": "Подтвердите, что вы действительно хотите удалить NetScaler", - "message.confirm.delete.NuageVsp": "Please confirm that you would like to delete Nuage Virtualized Services Directory", "message.confirm.delete.PA": "Подтвердите, что вы действительно хотите удалить Palo Alto", "message.confirm.delete.SRX": "Подтвердите, что вы действительно хотите удалить SRX", "message.confirm.delete.acl.list": "Are you sure you want to delete this ACL list?", diff --git a/ui/l10n/zh_CN.js b/ui/l10n/zh_CN.js index 6015f411edc..bb5f1d9eecd 100644 --- a/ui/l10n/zh_CN.js +++ b/ui/l10n/zh_CN.js @@ -307,7 +307,6 @@ var dictionary = { "label.add.F5.device": "添加 F5 设备", "label.add.LDAP.account": "添加LDAP账户", "label.add.NiciraNvp.device": "添加 Nvp 控制器", - "label.add.NuageVsp.device": "添加 Nuage 虚拟服务目录(VSD)", "label.add.OpenDaylight.device": "添加 OpenDaylight 控制器", "label.add.PA.device": "添加 Palo Alto 设备", "label.add.SRX.device": "添加 SRX 设备", @@ -604,7 +603,6 @@ var dictionary = { "label.delete.F5": "删除 F5", "label.delete.NetScaler": "删除 NetScaler", "label.delete.NiciraNvp": "删除 Nvp 控制器", - "label.delete.NuageVsp": "删除 Nuage VSD", "label.delete.OpenDaylight.device": "删除 OpenDaylight 控制器", "label.delete.PA": "删除 Palo Alto", "label.delete.SRX": "删除 SRX", @@ -1918,7 +1916,6 @@ var dictionary = { "message.add.system.service.offering": "请填写以下数据以添加一个新的系统服务方案。", "message.add.template": "请输入以下数据以创建新模板", "message.add.volume": "请填写以下数据以添加一个新卷。", - "message.added.new.nuage.vsp.controller": "添加新 Nuage Vsp 控制器", "message.added.vpc.offering": "添加 VPC 方案", "message.adding.Netscaler.device": "正在添加 NetScaler 设备", "message.adding.Netscaler.provider": "正在添加 NetScaler 提供程序", @@ -1967,7 +1964,6 @@ var dictionary = { "message.confirm.delete.BrocadeVcs": "请确认您确实要删除 Brocade Vcs 交换机", "message.confirm.delete.F5": "请确认您确实要删除 F5", "message.confirm.delete.NetScaler": "请确认您确实要删除 NetScaler", - "message.confirm.delete.NuageVsp": "请确认您确实要删除 Nuage 虚拟服务目录", "message.confirm.delete.PA": "请确认您确实要删除 Palo Alto", "message.confirm.delete.SRX": "请确认您确实要删除 SRX", "message.confirm.delete.acl.list": "是否确实要删除此 ACL 列表?", diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 4f523370207..62a602263f4 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -3315,14 +3315,7 @@ $supportsstrechedl2subnet.hide(); } - //PublicAccess checkbox should be displayed only when 'Connectivity' service is checked - if (args.$form.find('.form-item[rel=\"service.Connectivity.isEnabled\"]').find('input[type=checkbox]').is(':checked') - && $guestTypeField.val() == 'Shared' - && args.$form.find('.form-item[rel=\"service.Connectivity.provider\"]').find('select').val() == 'NuageVsp') { - $supportspublicaccess.css('display', 'inline-block'); - } else { - $supportspublicaccess.hide(); - } + $supportspublicaccess.hide(); }); args.$form.change(); diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js index 5d38d273cdd..d2360abda6c 100644 --- a/ui/scripts/ui-custom/zoneWizard.js +++ b/ui/scripts/ui-custom/zoneWizard.js @@ -725,9 +725,6 @@ $('