Code Review
/
msb
/
discovery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Allow using MSB GUI to register https service
[msb/discovery.git]
/
discovery-ui
/
src
/
main
/
resources
/
iui
/
microservices
/
js
/
serviceController.js
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
namespace:"",
\r
network_plane_type:"",
\r
host:"",
\r
- path:""
\r
+ path:"",
\r
+ enable_ssl:[]
\r
},
\r
nodeInfo:{
\r
ip:"",
\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.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
\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
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
$("#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
//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
\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
"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
"labels": labelArray,
\r
"metadata":metadata
\r
});
\r