Patch file for nuage provider fields

nuage.patch

From 8cc5af18af1db13f07bb537c49fd2b0a844122c5 Mon Sep 17 00:00:00 2001
From: Greg Blomquist <[email protected]>
Date: Fri, 3 Jun 2016 11:59:18 -0400
Subject: [PATCH] PAUSED: Use `git resume` to continue working.

---
 .../layouts/angular-bootstrap/_endpoints_angular.html.haml | 14 ++++++++++++--
 .../layouts/angular/_multi_auth_credentials.html.haml      |  4 ++++
 app/views/shared/views/ems_common/angular/_form.html.haml  | 10 ++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/angular-bootstrap/_endpoints_angular.html.haml b/app/views/layouts/angular-bootstrap/_endpoints_angular.html.haml
index 83b41db..641db81 100644
--- a/app/views/layouts/angular-bootstrap/_endpoints_angular.html.haml
+++ b/app/views/layouts/angular-bootstrap/_endpoints_angular.html.haml
@@ -24,6 +24,7 @@
   .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_api_port.$invalid}",
               "ng-if" => "emsCommonModel.emstype == 'openstack' || " +       |
                          "emsCommonModel.emstype == 'openstack_infra' || " + |
+                         "emsCommonModel.emstype == 'nuage' || " +           |
                          "emsCommonModel.emstype == 'rhevm' || " +           |
                          "emsCommonModel.ems_controller == 'ems_container'"} |
     %label.col-md-2.control-label{"for" => "textInput-markup"}
@@ -45,7 +46,10 @@
 
 %div{"ng-if" => defined?(security_protocol_hide) ? false : true}
   .form-group{"ng-class" => "{'has-error': angularForm.#{prefix}_security_protocol.$invalid}",
-              "ng-if"    => "emsCommonModel.emstype == 'openstack' || emsCommonModel.emstype == 'openstack_infra' || emsCommonModel.emstype == 'scvmm'"}
+              "ng-if"    => "emsCommonModel.emstype == 'openstack' || " +       |
+                            "emsCommonModel.emstype == 'openstack_infra' || " + |
+                            "emsCommonModel.emstype == 'nuage' || " +           |
+                            "emsCommonModel.emstype == 'scvmm'"}
     %label.col-md-2.control-label{"for" => "textInput-markup"}
       = _('Security Protocol')
     .col-md-8{"ng-if" => "emsCommonModel.emstype == 'openstack' || emsCommonModel.emstype == 'openstack_infra'"}
@@ -56,6 +60,13 @@
                        "checkchange"                 => "",
                        "required"                    => defined?(security_protocol_not_required) ? false : true,
                        "selectpicker-for-select-tag" => "")
+    .col-md-8{"ng-if" => "emsCommonModel.emstype == 'nuage'"}
+      = select_tag("#{prefix}_security_protocol",
+                       options_for_select([["<#{_('Choose')}>", nil]] + @nuage_security_protocols, disabled: ["<#{_('Choose')}>", nil]),
+                       "ng-model"                    => "#{ng_model}.#{prefix}_security_protocol",
+                       "checkchange"                 => "",
+                       "required"                    => defined?(security_protocol_not_required) ? false : true,
+                       "selectpicker-for-select-tag" => "")
     .col-md-8{"ng-if" => "emsCommonModel.emstype == 'scvmm'"}
       = select_tag("#{prefix}_security_protocol",
                        options_for_select([["<#{_('Choose')}>", nil]] + @scvmm_security_protocols, disabled: ["<#{_('Choose')}>", nil]),
@@ -83,4 +94,3 @@
       = _("Required")
     %span.help-block{"ng-show" => "angularForm.realm.$error.detectedSpaces"}
       = _("Spaces are prohibited")
-
diff --git a/app/views/layouts/angular/_multi_auth_credentials.html.haml b/app/views/layouts/angular/_multi_auth_credentials.html.haml
index c63d8b7..39c4807 100644
--- a/app/views/layouts/angular/_multi_auth_credentials.html.haml
+++ b/app/views/layouts/angular/_multi_auth_credentials.html.haml
@@ -304,6 +304,10 @@
     miq_tabs_show_hide("#ssh_keypair_tab", true);
     miq_tabs_init('#auth_tabs');
     $('#auth_tabs').show();
+%div{"ng-if" => "#{ng_model}.emstype == 'nuage'"}
+  :javascript
+    miq_tabs_init('#auth_tabs');
+    $('#auth_tabs').show();
 %div{"ng-if" => "#{ng_model}.ems_controller == 'ems_container'"}
   :javascript
     miq_tabs_show_hide("#hawkular_tab", true);
diff --git a/app/views/shared/views/ems_common/angular/_form.html.haml b/app/views/shared/views/ems_common/angular/_form.html.haml
index 5ad3d58..693db61 100644
--- a/app/views/shared/views/ems_common/angular/_form.html.haml
+++ b/app/views/shared/views/ems_common/angular/_form.html.haml
@@ -129,6 +129,16 @@
                             "required"    => true,
                             "checkchange" => ""}
 
+    .form-group{"ng-class" => "{'has-error': angularForm.api_version.$invalid}", "ng-if" => "emsCommonModel.emstype == 'nuage'"}
+      %label.col-md-2.control-label{"for" => "textInput-markup"}
+        = _("API Version")
+      .col-md-8
+        = select_tag('api_version',
+                     options_for_select(@nuage_api_versions),
+                     "ng-model"                    => "emsCommonModel.api_version",
+                     "checkchange"                 => "",
+                     "selectpicker-for-select-tag" => "")
+
     .form-group{"ng-class" => "{'has-error': angularForm.provider_id.$invalid}", "ng-if" => "emsCommonModel.emstype == 'openstack' && emsCommonModel.openstack_infra_providers_exist"}
       %label.col-md-2.control-label{"for" => "textInput-markup"}
         = _("Openstack Infra Provider")
-- 
1.9.3