Allow using MSB GUI to register https service

Issue-ID: MSB-198
Signed-off-by: Huabing Zhao <zhao.huabing@zte.com.cn>
Change-Id: I662a5bd2343790ffdf0d9838f3c661c482d95077

diff --git a/discovery-ui/src/main/resources/iui/microservices/js/serviceController.js b/discovery-ui/src/main/resources/iui/microservices/js/serviceController.js
index b8afc0e..bf112bf 100644 (file)
--- a/discovery-ui/src/main/resources/iui/microservices/js/serviceController.js
+++ b/discovery-ui/src/main/resources/iui/microservices/js/serviceController.js
@@ -91,7 +91,8 @@ var vm = avalon
                                namespace:"",\r
                                network_plane_type:"",\r
                                host:"",\r
-                               path:""                 \r
+                               path:"",\r
+                               enable_ssl:[]\r
                        },\r
                        nodeInfo:{\r
                                ip:"",\r
@@ -193,6 +194,7 @@ var vm = avalon
                                vm.msbRouteInfo.network_plane_type="";\r
                                vm.msbRouteInfo.host="";\r
                                vm.msbRouteInfo.path="";\r
+                               vm.msbRouteInfo.enable_ssl=[];\r
                        \r
                                \r
                                vm.server_rtn.warning_block=false;\r
@@ -250,7 +252,12 @@ var vm = avalon
                                                        vm.msbRouteInfo.network_plane_type=msbRouteInfo.network_plane_type;\r
                                                        vm.msbRouteInfo.host=msbRouteInfo.host;\r
                                                        vm.msbRouteInfo.path=msbRouteInfo.path;\r
-                                               \r
+                                                       if (msbRouteInfo.enable_ssl == true){\r
+                                                               vm.msbRouteInfo.enable_ssl=["true"];\r
+                                                       }else{\r
+                                                               vm.msbRouteInfo.enable_ssl=[];\r
+                                                       }\r
+                                                                                                       \r
                                                          $("#labels").val(msbRouteInfo.labels);\r
                                                          $('#labels').on('tokenfield:createdtoken', function (e) {\r
                                                            var re = /\S+:\S+/\r
@@ -879,7 +886,11 @@ var vm = avalon
                                //var newServiceName=(vm.msbRouteInfo.protocol=="UI"?("IUI_"+vm.msbRouteInfo.serviceName):vm.msbRouteInfo.serviceName);\r
                                var newServiceName=vm.msbRouteInfo.serviceName;\r
 \r
-                       \r
+                               var enable_ssl = false;\r
+                               if (vm.msbRouteInfo.enable_ssl.length > 0){\r
+                                       enable_ssl = true;\r
+                               }\r
+\r
 \r
                                var data= JSON.stringify({\r
                                                         "serviceName": newServiceName,\r
@@ -894,6 +905,7 @@ var vm = avalon
                                                          "network_plane_type":vm.msbRouteInfo.network_plane_type,\r
                                                          "host":vm.msbRouteInfo.host,\r
                                                          "path":vm.msbRouteInfo.path,\r
+                                                         "enable_ssl":enable_ssl,\r
                                                          "labels":     labelArray,\r
                                                          "metadata":metadata\r
                                                });\r

diff --git a/discovery-ui/src/main/resources/iui/microservices/serviceMng.html b/discovery-ui/src/main/resources/iui/microservices/serviceMng.html
index 520d263..1cbcd07 100644 (file)
--- a/discovery-ui/src/main/resources/iui/microservices/serviceMng.html
+++ b/discovery-ui/src/main/resources/iui/microservices/serviceMng.html
@@ -538,18 +538,15 @@
 \r
 \r
          <div class="row">\r
-\r
                 <div class="form-group col-xs-6">\r
                             <label class="control-label col-xs-3">\r
                                     Host\r
                                    \r
                                 </label>\r
                             <div class="col-xs-7">\r
-                            \r
                                 <input type="text" name="host" ms-duplex="msbRouteInfo.host"  ms-attr-disabled="vm.pageInfo.pageType=='view'" class="form-control" />\r
                                 <span class="help-block"></span>\r
                             </div>\r
-    \r
                  </div>\r
 \r
                   <div class="form-group col-xs-6">\r
@@ -558,19 +555,24 @@
                                    \r
                                 </label>\r
                             <div class="col-xs-7">\r
-                             \r
                                 <input type="text" name="path" ms-duplex="msbRouteInfo.path"  ms-attr-disabled="vm.pageInfo.pageType=='view'"  class="form-control " />\r
                                 <span class="help-block"></span>\r
                             </div>\r
-    \r
                  </div>\r
-      \r
-\r
          </div> \r
 \r
-\r
-                        \r
-\r
+         <div class="row">\r
+                <div class="form-group col-xs-6">\r
+                            <label class="control-label col-xs-3">\r
+                                    Enable SSL                                   \r
+                                </label>\r
+                            <div class="col-xs-7">\r
+                                <input type="checkbox" name="enable_ssl" id="enable_ssl" value="true" ms-duplex="msbRouteInfo.enable_ssl" ms-attr-disabled="vm.pageInfo.pageType=='view'" class="form-control" />\r
+                                \r
+                                <span class="help-block"></span>\r
+                            </div>\r
+                 </div>\r
+         </div>\r
             \r
      \r
             <div class="form-title">\r