Created
June 3, 2016 17:20
-
-
Save blomquisg/d7d2eac7066aaa747ecef985e5bcdb23 to your computer and use it in GitHub Desktop.
Patch for ems_common
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/controllers/ems_common.rb b/app/controllers/ems_common.rb | |
index 4ecc903..b6f6a79 100644 | |
--- a/app/controllers/ems_common.rb | |
+++ b/app/controllers/ems_common.rb | |
@@ -596,6 +596,7 @@ module EmsCommon | |
end | |
@edit[:openstack_api_versions] = retrieve_openstack_api_versions | |
+ @edit[:nuage_api_versions] = retrieve_nuage_api_versions | |
@edit[:new][:default_userid] = @ems.authentication_userid | |
@edit[:new][:default_password] = @ems.authentication_password | |
@@ -643,8 +644,10 @@ module EmsCommon | |
@openstack_infra_providers = retrieve_openstack_infra_providers | |
@openstack_security_protocols = retrieve_openstack_security_protocols | |
@openstack_amqp_security_protocols = retrieve_openstack_amqp_security_protocols | |
+ @nuage_security_protocols = retrieve_nuage_security_protocols | |
@scvmm_security_protocols = [[_('Basic (SSL)'), 'ssl'], ['Kerberos', 'kerberos']] | |
@openstack_api_versions = retrieve_openstack_api_versions | |
+ @nuage_api_versions = retrieve_nuage_api_versions | |
@emstype_display = model.supported_types_and_descriptions_hash[@ems.emstype] | |
end | |
@@ -664,10 +667,22 @@ module EmsCommon | |
[['Keystone v2', 'v2'], ['Keystone v3', 'v3']] | |
end | |
- def retrieve_openstack_security_protocols | |
+ def retrieve_nuage_api_versions | |
+ [['Version 3.2', 'v3_2'], ['Version 4.0', 'v4_0']] | |
+ end | |
+ | |
+ def retrieve_security_protocols | |
[[_('SSL without validation'), 'ssl'], [_('SSL'), 'ssl-with-validation'], [_('Non-SSL'), 'non-ssl']] | |
end | |
+ def retrieve_openstack_security_protocols | |
+ retrieve_security_protocols | |
+ end | |
+ | |
+ def retrieve_nuage_security_protocols | |
+ retrieve_security_protocols | |
+ end | |
+ | |
def retrieve_openstack_amqp_security_protocols | |
# OSP8 doesn't support SSL for AMQP | |
[[_('Non-SSL'), 'non-ssl']] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment