From 4571242354d5cd7456061ed97c552e2c6b0dd60e Mon Sep 17 00:00:00 2001 From: jiahuay Date: Wed, 22 Jan 2014 11:05:48 -0800 Subject: [PATCH] Add refresh function for each switch. Update switch API handling. Update loading state for 'find servers' button. Update servers order on host config page. Change-Id: Ia25f13a0c6fba3a3115646aa5af5995cc016bf6b --- public/css/base.css | 16 +- public/css/style.css | 6 +- public/img/blue_refresh_16px.png | Bin 0 -> 842 bytes public/img/green_check_16px.png | Bin 338 -> 3315 bytes public/img/red_cross_16px.png | Bin 0 -> 928 bytes public/img/refresh.png | Bin 0 -> 1607 bytes public/img/waiting_16px.gif | Bin 0 -> 2530 bytes public/ods/config.js | 284 +++++------ public/ods/fixtures/fixtures.js | 55 ++- public/ods/ods.js | 2 +- public/ods/ui/host_config/host_config.js | 2 +- public/ods/ui/host_config/views/init.ejs | 2 +- .../ods/ui/install_review/install_review.js | 82 ++-- public/ods/ui/networking/networking.js | 12 +- public/ods/ui/networking/views/init.ejs | 20 +- public/ods/ui/servers/servers.css | 6 +- public/ods/ui/servers/servers.js | 445 +++++------------- public/ods/ui/servers/views/init.ejs | 18 +- public/ods/ui/switch_entry/servers_test.html | 55 +++ public/ods/ui/switch_entry/switch_entry.css | 51 ++ public/ods/ui/switch_entry/switch_entry.js | 327 +++++++++++++ public/ods/ui/switch_entry/views/init.ejs | 27 ++ .../views/switch_row.ejs | 2 +- 23 files changed, 852 insertions(+), 560 deletions(-) create mode 100644 public/img/blue_refresh_16px.png create mode 100644 public/img/red_cross_16px.png create mode 100644 public/img/refresh.png create mode 100644 public/img/waiting_16px.gif create mode 100644 public/ods/ui/switch_entry/servers_test.html create mode 100644 public/ods/ui/switch_entry/switch_entry.css create mode 100644 public/ods/ui/switch_entry/switch_entry.js create mode 100644 public/ods/ui/switch_entry/views/init.ejs rename public/ods/ui/{servers => switch_entry}/views/switch_row.ejs (94%) diff --git a/public/css/base.css b/public/css/base.css index 7bc7e08..1c4f524 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -119,8 +119,9 @@ color:#ffffff; font-family:arial; font-size:12px; - padding: 3px 20px; + padding: 5px 20px; text-decoration:none; + width: 120px } .btn_find:hover { background: rgba(50,54,162,1); @@ -131,6 +132,19 @@ background: -ms-linear-gradient(top, rgba(50,54,162,1) 0%, rgba(141,146,251,1) 100%); background: linear-gradient(to bottom, rgba(50,54,162,1) 0%, rgba(141,146,251,1) 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3236a2', endColorstr='#8d92fb', GradientType=0 ); + cursor: pointer; +} +.btn_find[disabled] { + background: rgba(50,54,162,1); + background: -moz-linear-gradient(top, rgba(50,54,162,1) 0%, rgba(141,146,251,1) 100%); + background: -webkit-gradient(left top, left bottom, color-stop(0%, rgba(50,54,162,1)), color-stop(100%, rgba(141,146,251,1))); + background: -webkit-linear-gradient(top, rgba(50,54,162,1) 0%, rgba(141,146,251,1) 100%); + background: -o-linear-gradient(top, rgba(50,54,162,1) 0%, rgba(141,146,251,1) 100%); + background: -ms-linear-gradient(top, rgba(50,54,162,1) 0%, rgba(141,146,251,1) 100%); + background: linear-gradient(to bottom, rgba(50,54,162,1) 0%, rgba(141,146,251,1) 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#3236a2', endColorstr='#8d92fb', GradientType=0 ); + opacity: 0.5; + cursor: default; } .btn_find_inactive { diff --git a/public/css/style.css b/public/css/style.css index db585d1..9fcd150 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -8,7 +8,7 @@ body { #header { height: 60px; - min-width: 1150px; + min-width: 1200px; background-color: rgb(248, 248, 248); background-image: url("../img/hw_000469.jpg"); border-bottom: 1px solid rgb(255, 255, 255); @@ -30,7 +30,7 @@ body { #menu { height: 46px; - min-width: 1150px; + min-width: 1200px; overflow: hidden; width: auto !important; margin: 0px auto; @@ -106,7 +106,7 @@ h2 { } #content { - min-width: 1150px; + min-width: 1200px; min-height: 200px; overflow-x: hidden; position: relative; diff --git a/public/img/blue_refresh_16px.png b/public/img/blue_refresh_16px.png new file mode 100644 index 0000000000000000000000000000000000000000..fe97c4a00b811e14ee7ddd826c2b08a1158ef094 GIT binary patch literal 842 zcmV-Q1GW5#P)`6pHRCwB?Q%g(}Q53y1owm~fvG&KO z4Ma+T3izSKAO@owh$2Q=5JT9xa^r%HI~FF!om=C|#1J+n#7Hzo*%4g`H8BVx#Uiv* z?H|TYJOA-cDOKabg_E53X5P8)ymRlJN9ei^|MO7BaN$wvAx?{`s?Lxk*+dY;7=8~R z+ADDzh_`syoTjP?MNvSJWq5bXzb~LFN(d(dK@*`51X`FjpPP2nF%)C)Tu}+e)573p zjK3kNFpW#|2M$PMFcc?8nnE}akDPIxZ*kH-3J69NH7J!-AQWJl9klQ2InPO(74Cwr zkN%N@EJ?7Jm*D!4H8#y1)icu2I_mByxzGZYg!no z#J&Sj#GDk^j^x18XoK13k#HoMdnpS-pRQ?r+wAW2!cu%Sn=c68VjTFrHkTqvW7QNS z6rgPs*qt_F~pH3f7Ke(-qtuNGl9 z2631Xc)l#cCQDPzE(Q(}HU`}Vssci(bZ>OHyXAYbKrDaQ{(-?^v&90~Qb4O93MDX^ zC?HKH;8hKHQ7OCrRYXxV$I=D2L{bg4wU*jkdQUHM+VJDuIILb;ib+$BOzT@cPl3Y0j-zRWws}{lLJk4%UUo)zt%vA;O_mnW#wY9ld zKIgT|u&!9hn%+L2zyGus={io*U|rV1W+5Q{^u>zG7pJiviE^Qh%Y@Yi($fiK$CXyn z+dXa$1dbE_)}ZEawi*ItE?d;2TRC|nlF`_eY3=i~c`daL<-HXF!-*5&B90tAOtcMk zf-86eDEgF<0;qBna*62ZMr3fWav)$7lc|9E#|>5yJfetuwVwhE0DxbG UwvYlgcK`qY07*qoM6N<$f`|)!3jhEB literal 0 HcmV?d00001 diff --git a/public/img/green_check_16px.png b/public/img/green_check_16px.png index e09bb4e796f67c9c093a4777dd8eb07a7211c267..6bd8724f669783e2f49cf51b6a9c59277a9c2603 100644 GIT binary patch delta 3311 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 FV1kO@03HAU literal 0 HcmV?d00001 diff --git a/public/img/waiting_16px.gif b/public/img/waiting_16px.gif new file mode 100644 index 0000000000000000000000000000000000000000..85b99d46b9911ba53a792d716d9f688f3bb3c784 GIT binary patch literal 2530 zcmb8xdrVVT90%}oAH9#>bK6p?cF>G=h0@JhTLdf!(gIdN1QeV+L;)2XD9^zNN@xod zwcvQjRvj8}y3J)yFv=3A2@i*l5Fc|hs2f3R;^QAN{$aL%*eO}IEP(~izxV$0$@lmB zp0hT=YKq8{00}@xHO(cjNl%Njq^=3k8whNA8mRstISPn@&imc_Tf_3@%d4xaj~qF2 z`t<3uXU|@|c=5`WE2E>Mw{G3KfB*i(#Kf~_&tAQH_4e)C>6t?woVxLBCtLOMhuB(t zGPLP@xf$T%5Zyz3iOuKI^?SO*zNFJ?wrL@=YKNznIpw!L(PPjKYQ7%}eBCama_c91pIJ1~(b1Kal`fZSz8V+OJY|r^QHxE6+WMoDB(^~{XdW=!#+uo_ zaF>U{k0Hho~yN%NrSyV`soxiBvd>cj#}5&$KDA)3{S^?ffCPkeDi5Vo>T8sy}Wj_Hf}N$J0Hz& zv|)_<-f+~-Hi-jgzIkG5vY*T|>7-8J0U*@$d8~ScFqA)f4R7yaDBs3j(<2>@V?*ZD zy6{Vy+~KLc_m5He=9(fsy~0c&4a-*{&i)i(02j`@8?In8dBM!Y(Znu4jtn@VMj|y5 zrTNa5ki}vtEiGN(#07>Rk#HaVI5ZB4@@yk%765mBN(yieTXgm{oK}vXn!h0oZG3gj;>>W?MbZnG6Q_cX~h&<^+R)8g9 zSd!4lZEm4K#ma0{aTpMHv%wr`1VF@rrKl5H7Hyn$;=;nh3JVMEcKbqhXnqO(3z}-# zu=v1OV7q%OY`*dVI>Y}97i4s2yl$S zmSto?fO|=u8h;vSPKY2zqaEs;LlhJgv~%aqwzjtUie_4FUNiT>r-& zOO#{4cBb6f^ zov;AUp?UAne>@_GHz5+(221Xlve$OHK)tvvi!~l<%)zr4PhU@ z(CY^us$O5!${6Pje5gy?*WtA2j>{<;$_PvVQNKa&69IX)a|Fw5>C&=WQ6s37gabVh SjHs`-`=fdj^ILtus=om5Wbpz3 literal 0 HcmV?d00001 diff --git a/public/ods/config.js b/public/ods/config.js index 890c9d6..3a25ad9 100644 --- a/public/ods/config.js +++ b/public/ods/config.js @@ -1,149 +1,153 @@ config = { - "switches": [ - { - "switch": { - "ip": "172.29.8.40", - "credential": { - "version": "v2c", - "community": "public" - } - } - }, - { - "switch": { - "ip": "172.29.8.41", - "credential": { - "version": "v2c", - "community": "public" - } - } - } - ], - "security": { - "server_credentials": { - "username": "root", - "password": "root" - }, - "service_credentials": { - "username": "service", - "password": "admin" - }, - "console_credentials": { - "username": "console", - "password": "admin" - } - }, - "networking": { - "interfaces": { - "management": { - "ip_start": "10.10.10.100", - "ip_end": "10.10.10.255", - "netmask": "255.255.255.0", - "gateway": "10.10.10.1", - "nic": "eth0", - "promisc": 0 - }, - "tenant": { - "ip_start": "192.168.100.100", - "ip_end": "192.168.100.200", - "netmask": "255.255.255.0", - "gateway": "192.168.100.1", - "nic": "eth0", - "promisc": 0 - }, - "public": { - "ip_start": "172.29.3.100", - "ip_end": "172.29.3.200", - "netmask": "255.255.255.0", - "gateway": "172.29.3.1", - "nic": "eth1", - "promisc": 1 - }, - "storage": { - "ip_start": "172.16.128.10", - "ip_end": "172.16.128.200", - "netmask": "255.255.255.0", - "gateway": "172.16.128.1", - "nic": "eth0", - "promisc": 0 - } - }, - "global": { - "nameservers": "4.4.4.4,8.8.8.8", - "search_path": "ods.com", - "gateway": "172.19.100.1", - "proxy": "", - "ntp_server": "" - } - } + "switches": [{ + "switch": { + "ip": "172.29.8.40", + "credential": { + "version": "v2c", + "community": "public" + } + } + }, { + "switch": { + "ip": "172.29.8.41", + "credential": { + "version": "v2c", + "community": "public" + } + } + }, { + "switch": { + "ip": "172.29.8.42", + "credential": { + "version": "v2c", + "community": "public" + } + } + }], + "security": { + "server_credentials": { + "username": "root", + "password": "root" + }, + "service_credentials": { + "username": "service", + "password": "admin" + }, + "console_credentials": { + "username": "console", + "password": "admin" + } + }, + "networking": { + "interfaces": { + "management": { + "ip_start": "10.10.10.100", + "ip_end": "10.10.10.255", + "netmask": "255.255.255.0", + "gateway": "10.10.10.1", + "nic": "eth0", + "promisc": 0 + }, + "tenant": { + "ip_start": "192.168.100.100", + "ip_end": "192.168.100.200", + "netmask": "255.255.255.0", + "gateway": "192.168.100.1", + "nic": "eth0", + "promisc": 0 + }, + "public": { + "ip_start": "172.29.3.100", + "ip_end": "172.29.3.200", + "netmask": "255.255.255.0", + "gateway": "172.29.3.1", + "nic": "eth1", + "promisc": 1 + }, + "storage": { + "ip_start": "172.16.128.10", + "ip_end": "172.16.128.200", + "netmask": "255.255.255.0", + "gateway": "172.16.128.1", + "nic": "eth0", + "promisc": 0 + } + }, + "global": { + "nameservers": "4.4.4.4,8.8.8.8", + "search_path": "ods.com", + "gateway": "172.19.100.1", + "proxy": "", + "ntp_server": "" + } + } }; config_demo = { - "switches": [ - { - "switch": { - "ip": "127.0.0.1", - "credential": { - "version": "v2c", - "community": "public" - } - } - } ], + "switches": [{ + "switch": { + "ip": "127.0.0.1", + "credential": { + "version": "v2c", + "community": "public" + } + } + }], "security": { - "server_credentials": { - "username": "root", - "password": "huawei123" - }, - "service_credentials": { - "username": "service", - "password": "huawei123" - }, - "console_credentials": { - "username": "console", - "password": "huawei123" - } + "server_credentials": { + "username": "root", + "password": "huawei123" + }, + "service_credentials": { + "username": "service", + "password": "huawei123" + }, + "console_credentials": { + "username": "console", + "password": "huawei123" + } }, "networking": { - "interfaces": { - "management": { - "ip_start": "33.33.33.100", - "ip_end": "33.33.33.255", - "netmask": "255.255.255.0", - "gateway": "33.33.33.10", - "nic": "eth0", - "promisc": 0 - }, - "tenant": { - "ip_start": "192.168.100.100", - "ip_end": "192.168.100.200", - "netmask": "255.255.255.0", - "gateway": "192.168.100.1", - "nic": "eth0", - "promisc": 0 - }, - "public": { - "ip_start": "172.29.3.100", - "ip_end": "172.29.3.200", - "netmask": "255.255.255.0", - "gateway": "172.29.3.1", - "nic": "eth1", - "promisc": 1 - }, - "storage": { - "ip_start": "172.16.128.10", - "ip_end": "172.16.128.200", - "netmask": "255.255.255.0", - "gateway": "172.16.128.1", - "nic": "eth0", - "promisc": 0 - } - }, - "global": { - "nameservers": "33.33.33.10", - "search_path": "ods.com", - "gateway": "33.33.33.10", - "proxy": "http://33.33.33.10:3128", - "ntp_server": "33.33.33.10" - } + "interfaces": { + "management": { + "ip_start": "33.33.33.100", + "ip_end": "33.33.33.255", + "netmask": "255.255.255.0", + "gateway": "33.33.33.10", + "nic": "eth0", + "promisc": 0 + }, + "tenant": { + "ip_start": "192.168.100.100", + "ip_end": "192.168.100.200", + "netmask": "255.255.255.0", + "gateway": "192.168.100.1", + "nic": "eth0", + "promisc": 0 + }, + "public": { + "ip_start": "172.29.3.100", + "ip_end": "172.29.3.200", + "netmask": "255.255.255.0", + "gateway": "172.29.3.1", + "nic": "eth1", + "promisc": 1 + }, + "storage": { + "ip_start": "172.16.128.10", + "ip_end": "172.16.128.200", + "netmask": "255.255.255.0", + "gateway": "172.16.128.1", + "nic": "eth0", + "promisc": 0 + } + }, + "global": { + "nameservers": "33.33.33.10", + "search_path": "ods.com", + "gateway": "33.33.33.10", + "proxy": "http://33.33.33.10:3128", + "ntp_server": "33.33.33.10" + } } }; \ No newline at end of file diff --git a/public/ods/fixtures/fixtures.js b/public/ods/fixtures/fixtures.js index 5194d70..ca8021a 100644 --- a/public/ods/fixtures/fixtures.js +++ b/public/ods/fixtures/fixtures.js @@ -15,17 +15,18 @@ steal("jquery/dom/fixture", "jquery/lang/json", function(){ var manage_ip = JSON.parse(original.data).switch.ip; var switchId = 1; - if(manage_ip == "172.29.8.40") { + if (manage_ip == "172.29.8.40") { switchId = 1; - } - else if(manage_ip == "172.29.8.41"){ + } else if (manage_ip == "172.29.8.41") { switchId = 2; + } else if (manage_ip == "172.29.8.42") { + switchId = 3; } var returnData = { "status": "accepted", "switch": { - "state": "not_reached", + "state": "initialized", "link": { "href": "/switches/"+switchId+"/", "rel": "self" @@ -41,12 +42,15 @@ steal("jquery/dom/fixture", "jquery/lang/json", function(){ }; //var xhr = {responseText: JSON.stringify(duplicateErr), status: 409}; - if(switchId == 1) { - return [202, "accepted", returnData, {} ]; + if (switchId == 1) { + return [202, "accepted", returnData, {}]; //return [202, returnData ]; - } - else if(switchId == 2) { + } else if (switchId == 2) { return [409, duplicateErr]; + //return [202, "accepted", returnData, {} ]; + } else if (switchId == 3) { + //return [409, duplicateErr]; + return [202, "accepted", returnData, {} ]; } }); @@ -57,7 +61,7 @@ steal("jquery/dom/fixture", "jquery/lang/json", function(){ var returnData = { "status": "accepted", "switch": { - "state": "not_reached", + "state": "repulling", "link": { "href": "/switches/"+switchId+"/", "rel": "self" @@ -76,7 +80,8 @@ steal("jquery/dom/fixture", "jquery/lang/json", function(){ var returnData = { "status": "OK", "switch": { - "state": switchId == 10 ? "not_reached" : "under_monitoring", + "state": switchId == 10 ? "initialized" : "under_monitoring", + "err-msg": "error message", "link": { "href": settings.url, "rel": "self" @@ -183,6 +188,36 @@ steal("jquery/dom/fixture", "jquery/lang/json", function(){ }; return returnData; } + else if(switchId == 3) { + var returnData = { + "status": "OK", + "machines": [ + { + "mac": "28:e5:ee:23:14:92", + "vlan": 3, + "link": { + "href": "/api/machines/80", + "rel": "self" + }, + "id": 80, + "port": 1, + "switch_ip": "172.29.8.42" + }, + { + "mac": "28:22:77:c2:46:4a", + "vlan": 3, + "link": { + "href": "/api/machines/90", + "rel": "self" + }, + "id": 90, + "port": 2, + "switch_ip": "172.29.8.42" + } + ] + }; + return returnData; + } }); diff --git a/public/ods/ods.js b/public/ods/ods.js index 5eaf17b..7ba6f7c 100644 --- a/public/ods/ods.js +++ b/public/ods/ods.js @@ -18,7 +18,7 @@ steal( feature: null, machines: [], switches: [], - snmp: 1, + snmp: true, adapter_id: null }; diff --git a/public/ods/ui/host_config/host_config.js b/public/ods/ui/host_config/host_config.js index 1b8b903..45e9d5d 100644 --- a/public/ods/ui/host_config/host_config.js +++ b/public/ods/ui/host_config/host_config.js @@ -48,7 +48,7 @@ steal( } }); - $(document).tooltip({ + $(".pattern-tip").tooltip({ items: "[data-geo], [title]", content: function() { var element = $(this); diff --git a/public/ods/ui/host_config/views/init.ejs b/public/ods/ui/host_config/views/init.ejs index d108977..f478532 100644 --- a/public/ods/ui/host_config/views/init.ejs +++ b/public/ods/ui/host_config/views/init.ejs @@ -17,7 +17,7 @@ - +

diff --git a/public/ods/ui/install_review/install_review.js b/public/ods/ui/install_review/install_review.js index d98beb9..24542fb 100644 --- a/public/ods/ui/install_review/install_review.js +++ b/public/ods/ui/install_review/install_review.js @@ -129,18 +129,14 @@ steal( $("#continuing").css("opacity", 1); var cluster_id = this.options.odsState.cluster_id; - Ods.Cluster.action( - cluster_id, { - "deploy": "" - }, - this.proxy('onTriggerDeploy'), - this.proxy('onTriggerDeployErr')); + Ods.Cluster.action(cluster_id, {"deploy": []}, + this.proxy('onTriggerDeploy'), + this.proxy('onTriggerDeployErr')); }, onTriggerDeploy: function(data, textStatus, xhr) { steal.dev.log(" *** onTriggerDeploy data *** ", data); - steal.dev.log(" *** onTriggerDeploy textStatus *** ", - textStatus); + steal.dev.log(" *** onTriggerDeploy textStatus *** ", textStatus); steal.dev.log(" *** onTriggerDeploy xhr *** ", xhr); if (xhr.status == 202) { // accepted @@ -155,8 +151,7 @@ steal( onTriggerDeployErr: function(xhr, status, statusText) { steal.dev.log(" *** onTriggerDeployErr xhr *** ", xhr); steal.dev.log(" *** onTriggerDeployErr status *** ", status); - steal.dev.log(" *** onTriggerDeployErr statusText *** ", - statusText); + steal.dev.log(" *** onTriggerDeployErr statusText *** ", statusText); }, initProgressbars: function() { @@ -186,8 +181,7 @@ steal( switchjson.children.push(serverjson); // initiate list based progress bars - this.initListProgressbar(servers[i].clusterhost_id, - servers[i].hostname); + this.initListProgressbar(servers[i].clusterhost_id, servers[i].hostname); } this.serverTreeJson.children.push(switchjson); } @@ -202,10 +196,8 @@ steal( this.totalProgressbar.progressbar({ value: false }); - this.totalProgressLabel = this.totalProgressbar.children( - ".progress-label"); - this.totalProgressbarValue = this.totalProgressbar.find( - ".ui-progressbar-value"); + this.totalProgressLabel = this.totalProgressbar.children(".progress-label"); + this.totalProgressbarValue = this.totalProgressbar.find(".ui-progressbar-value"); }, initListProgressbar: function(hostid, hostname) { @@ -214,8 +206,7 @@ steal( "hostid": hostid, "message": "Waiting..." } - $("#tabs-2 table tbody").append(this.view('progress_row', - initPData)); + $("#tabs-2 table tbody").append(this.view('progress_row', initPData)); var pbar = $('div[data-hostid="' + hostid + '"]'); pbar.progressbar({ @@ -247,10 +238,7 @@ steal( this.pendingHostList = []; for (var i = 0; i < count; i++) { - Ods.ClusterHost.progress( - hosts[i], - this.proxy('updateProgressBar'), - this.proxy('updateProgressBarErr')); + Ods.ClusterHost.progress(hosts[i], this.proxy('updateProgressBar'), this.proxy('updateProgressBarErr')); } }, @@ -263,12 +251,12 @@ steal( steal.dev.log(" *** onUpdateProgressBar textStatus *** ", textStatus); steal.dev.log(" *** onUpdateProgressBar xhr *** ", xhr); - this.pendingHostCount --; + this.pendingHostCount--; var progressData = data.progress; - if(progressData.percentage < 1) { + if (progressData.percentage < 1) { this.pendingHostList.push(progressData.id); } @@ -289,8 +277,7 @@ steal( updateProgressBarErr: function(xhr, status, statusText) { steal.dev.log(" *** updateProgressBarErr xhr *** ", xhr); steal.dev.log(" *** updateProgressBarErr status *** ", status); - steal.dev.log(" *** updateProgressBarErr statusText *** ", - xhr); + steal.dev.log(" *** updateProgressBarErr statusText *** ", xhr); //TODO }, @@ -311,16 +298,13 @@ steal( } // update graph-based progress bar - if ($('rect[data-hostid="' + progressData.id + '"]')) { - // check if the node is expanded + if ($('rect[data-hostid="' + progressData.id + '"]')) { // check if the node is expanded if (progressData.percentage > 1.0) { progressData.percentage = 1.0; } - $('rect[data-hostid="' + progressData.id + '"]') - .attr("width", imgWidth * progressData.percentage); + $('rect[data-hostid="' + progressData.id + '"]').attr("width", imgWidth * progressData.percentage); - $('text[data-hostid="' + progressData.id + '"]') - .text(progressData.message); + $('text[data-hostid="' + progressData.id + '"]').text(progressData.message); } }, @@ -360,17 +344,14 @@ steal( "background": "#5BB75B" }); } else { - pbar.progressbar( - "value", progressData.percentage * 100) + pbar.progressbar("value", progressData.percentage * 100) } } }, updateTotalBar: function(data) { - if(this.pendingHostCount == 0) { - Ods.Cluster.progress(this.options.odsState.cluster_id, - this.proxy('onTotalProgressData'), - this.proxy('onTotalProgressDataErr')); + if (this.pendingHostCount == 0) { + Ods.Cluster.progress(this.options.odsState.cluster_id, this.proxy('onTotalProgressData'), this.proxy('onTotalProgressDataErr')); } }, @@ -379,8 +360,7 @@ steal( /********************************************/ onTotalProgressData: function(data, textStatus, xhr) { steal.dev.log(" *** onTotalProgressData data *** ", data); - steal.dev.log(" *** onTotalProgressData textStatus *** ", - textStatus); + steal.dev.log(" *** onTotalProgressData textStatus *** ", textStatus); steal.dev.log(" *** onTotalProgressData xhr *** ", xhr); var total = data.progress.percentage; @@ -397,9 +377,7 @@ steal( setTimeout(this.proxy('getProgressData'), 3000); } else { this.totalProgressbar.progressbar("value", 100); - Ods.DashboardLink.findOne( - this.options.odsState.cluster_id, - this.proxy('onFindDashboardLink')); + Ods.DashboardLink.findOne(this.options.odsState.cluster_id, this.proxy('onFindDashboardLink')); } }, @@ -408,23 +386,18 @@ steal( /********************************************/ onTotalProgressDataErr: function(xhr, status, statusText) { steal.dev.log(" *** onTotalProgressDataErr xhr *** ", xhr); - steal.dev.log(" *** onTotalProgressDataErr status *** ", - status); - steal.dev.log(" *** onTotalProgressDataErr statusText *** ", - xhr); + steal.dev.log(" *** onTotalProgressDataErr status *** ", status); + steal.dev.log(" *** onTotalProgressDataErr statusText *** ", xhr); //TODO }, onFindDashboardLink: function(data, textStatus, xhr) { steal.dev.log(" *** onFindDashboardLink data *** ", data); - steal.dev.log(" *** onFindDashboardLink textStatus *** ", - textStatus); + steal.dev.log(" *** onFindDashboardLink textStatus *** ", textStatus); steal.dev.log(" *** onFindDashboardLink xhr *** ", xhr); if (data.status == "OK") { - $(".dashboard-link").attr( - "href", - data.dashboardlinks["os-single-controller"]); + $(".dashboard-link").attr("href", data.dashboardlinks["os-single-controller"]); $(".dashboard-link").attr("target", "_blank"); $(".dashboard-link").removeClass("disabled"); } @@ -432,7 +405,7 @@ steal( '.ui-tabs-nav click': function(el, ev) { if ($("#tabs-2").is(":visible")) { - var children = this.serverTreeJson.children; + var children = this.serverTreeJson.children; for (var sw in children) { var servers = children[sw]._children; if (servers == null) { @@ -486,8 +459,7 @@ steal( .attr("width", width + margin.right + margin.left) .attr("height", height + margin.top + margin.bottom) .append("g") - .attr("transform", - "translate(" + margin.left + "," + margin.top + ")"); + .attr("transform", "translate(" + margin.left + "," + margin.top + ")"); root = this.serverTreeJson; root.x0 = height / 2; diff --git a/public/ods/ui/networking/networking.js b/public/ods/ui/networking/networking.js index c92c36a..a57dac9 100644 --- a/public/ods/ui/networking/networking.js +++ b/public/ods/ui/networking/networking.js @@ -165,7 +165,7 @@ steal( server['roles'] = []; } - server['server_ip'] = this.startPrefix + (parseInt(this.startLastDigit) + i); + //server['server_ip'] = this.startPrefix + (parseInt(this.startLastDigit) + i); var switchIp = server.switch_ip; if (this.serverData[switchIp] == undefined) { @@ -176,6 +176,16 @@ steal( } this.options.odsState.servers_config = this.serverData; + var j = 0; + var serverData = this.options.odsState.servers_config; + for (var key in serverData) { + var servers = serverData[key]; + for (var i = 0; i < servers.length; i++) { + serverData[key][i]['server_ip'] = this.startPrefix + (parseInt(this.startLastDigit) + j); + j++; + } + } + var networkingData = { "networking": { "interfaces": { diff --git a/public/ods/ui/networking/views/init.ejs b/public/ods/ui/networking/views/init.ejs index 7166b93..18b31cd 100644 --- a/public/ods/ui/networking/views/init.ejs +++ b/public/ods/ui/networking/views/init.ejs @@ -26,12 +26,12 @@ -
+
(This selection should be consistent with your networking plan.)
Promisc Mode - The interface running in promisc mode will receive all packages in network. + (The interface running in promisc mode will receive and pass all the trafic.)
@@ -65,7 +65,7 @@ Promisc Mode - The interface running in promisc mode will receive all packages in network. + (The interface running in promisc mode will receive and pass all the trafic.) @@ -105,7 +105,7 @@ Promisc Mode - The interface running in promisc mode will receive all packages in network. + (The interface running in promisc mode will receive and pass all the trafic.) @@ -141,7 +141,7 @@ Promisc Mode - The interface running in promisc mode will receive all packages in network. + (The interface running in promisc mode will receive and pass all the trafic.) @@ -150,23 +150,23 @@ - + - + - + - + - +
Nameservere.g. "[compass server ip]"
Search Pathe.g. "ods.com"
Gatewaye.g. "[compass server gateway ip]"
Proxy (optional)e.g. "http://[compass server ip]:3128"
NTP Server (optional)e.g. "[compass server ip]"
diff --git a/public/ods/ui/servers/servers.css b/public/ods/ui/servers/servers.css index 84ec77c..a2e3bf0 100644 --- a/public/ods/ui/servers/servers.css +++ b/public/ods/ui/servers/servers.css @@ -85,15 +85,15 @@ table.display thead th { } .sorting { - background: url('../../../img/bg.gif') no-repeat center right; + background: url('../../../img/bg.gif') no-repeat 60% 50%; } .sorting_desc { - background: url('../../../img/desc.gif') no-repeat center right; + background: url('../../../img/desc.gif') no-repeat 60% 50%; } .sorting_asc { - background: url('../../../img/asc.gif') no-repeat center right; + background: url('../../../img/asc.gif') no-repeat 60% 50%; } .highlight { diff --git a/public/ods/ui/servers/servers.js b/public/ods/ui/servers/servers.js index dbdca72..938e765 100644 --- a/public/ods/ui/servers/servers.js +++ b/public/ods/ui/servers/servers.js @@ -7,20 +7,20 @@ steal( './servers.css', './views/init.ejs', 'lib/jquery.dataTables.js', - './views/switch_row.ejs', + //'lib/jquery.dataTables.dataSourcePlugins.js', 'ods/models/servers.js', - 'ods/models/cluster.js' + 'ods/models/cluster.js', + 'ods/ui/switch_entry' ).then(function($) { $.Controller('Ods.Ui.servers', {}, { init: function() { this.element.html(this.view('init')); - this.pendingSwitchList = []; - // we query up to 10 times. Report an error if any of the switches // remains in not_reached status. this.queryCount = 0; + this.displayNodes = []; this.initServerTable(); this.checked_num = 0; @@ -50,10 +50,8 @@ steal( var oldSwitchesData = this.options.odsState.switches; - + var tbody = $(".switchtable tbody"); if (oldSwitchesData.length > 0) { - var tbody = $(".switchtable tbody"); - if (this.options.odsState.snmp) { $('#useSNMP').prop('checked', true); } else { @@ -61,39 +59,31 @@ steal( } for (var i = 0; i < oldSwitchesData.length; i++) { - if (i > 0) { - tbody.append(this.view('switch_row')); - } - if (this.options.odsState.snmp) { - $("#snmpTitle").html("SNMP Version"); - $("#communityTitle").html("Community"); - $(".switch_row").find(".snmp").show(); - $(".switch_row").find(".community").show(); - $(".switch_row").find(".username").hide(); - $(".switch_row").find(".password").hide(); - } else { - $("#snmpTitle").html("Username"); - $("#communityTitle").html("Password"); - $(".switch_row").find(".snmp").hide(); - $(".switch_row").find(".community").hide(); - $(".switch_row").find(".username").show(); - $(".switch_row").find(".password").show(); - } - - if (this.options.odsState.snmp) { - $(".switch_row").eq(i).find(".switchIp").val(oldSwitchesData[i].switch.ip); - $(".switch_row").eq(i).find(".snmp").val(oldSwitchesData[i].switch.credential.version); - $(".switch_row").eq(i).find(".community").val(oldSwitchesData[i].switch.credential.community); - } else { - $(".switch_row").eq(i).find(".switchIp").val(oldSwitchesData[i].switch.ip); - $(".switch_row").eq(i).find(".username").val(oldSwitchesData[i].switch.credential.username); - $(".switch_row").eq(i).find(".password").val(oldSwitchesData[i].switch.credential.password); - } + tbody.append(""); + var tr = tbody.find("tr:last"); + tr.ods_ui_switch_entry({ + "odsState": this.options.odsState, + "switchData": oldSwitchesData[i].switch, + "first": i == 0, + "serverControl": this + }); } + } else { + tbody.append(""); + var tr = tbody.find("tr:last"); + tr.ods_ui_switch_entry({ + "odsState": this.options.odsState, + "switchData": null, + "first": true, + "serverControl": this + }); } + }, initServerTable: function() { + var currNode = []; + var self = this; this.dataTable = $('#tb_server_select').dataTable({ "sScrollY": "200px", "bPaginate": false, @@ -117,12 +107,24 @@ steal( aTargets: [0, 1, 3] }, { bSearchable: false, - aTargets: [ 0 ] + aTargets: [0] }], "aaSorting": [ [2, "asc"], [4, "asc"] - ] + ], + "fnPreDrawCallback": function(oSettings) { + /* reset currNode before each draw*/ + currNode = []; + }, + "fnRowCallback": function(nRow, aData, iDisplayIndex, iDisplayIndexFull) { + /* push this row of data to currNode array*/ + currNode.push(nRow); + }, + "fnDrawCallback": function(oSettings) { + /* can now access sorted node array*/ + self.displayNodes = currNode; + } }); $('.dataTables_info').remove(); @@ -130,21 +132,30 @@ steal( $('.dataTables_filter input').addClass('rounded'); }, + removeServersBySwitch: function(switchIp) { + var servers = this.dataTable.fnGetData(); + var serversCount = servers.length; + var i = 0; + while (i < serversCount) { + if (servers[i].switch_ip == switchIp) { + this.dataTable.fnDeleteRow(i); + servers = this.dataTable.fnGetData(); + serversCount = servers.length; + } else { + i++; + } + } + }, + 'input[name="snmp"] click': function(el, ev) { + this.options.odsState.attr("snmp", el.val() == "snmp"); + if (el.val() == "snmp") { $("#snmpTitle").html("SNMP Version"); $("#communityTitle").html("Community"); - $(".snmp").show(); - $(".community").show(); - $(".username").hide(); - $(".password").hide(); } else { $("#snmpTitle").html("Username"); $("#communityTitle").html("Password"); - $(".snmp").hide(); - $(".community").hide(); - $(".username").show(); - $(".password").show(); } }, @@ -203,22 +214,23 @@ steal( }, 'getSelectedServers': function() { - selectedServers = []; + console.log("displayNodes ", this.displayNodes); + var selectedServers = []; this.options.odsState.servers = []; this.options.odsState.servers_config = []; // loop through dataTable nodes to find selected servers - for (var i = 0; i < this.dataTable.fnGetNodes().length; i++) { - var ckboxTd = $('td', this.dataTable.fnGetNodes()[i])[0]; + for (var i = 0; i < this.displayNodes.length; i++) { + var ckboxTd = $('td', this.displayNodes[i])[0]; var server_ckbox = $('input', ckboxTd)[0]; if (server_ckbox.checked == true) { - var checkTd = $('td', this.dataTable.fnGetNodes()[i])[1]; - var macTd = $('td', this.dataTable.fnGetNodes()[i])[1]; - var switchIpTd = $('td', this.dataTable.fnGetNodes()[i])[2]; - var vlanTd = $('td', this.dataTable.fnGetNodes()[i])[3]; - var portTd = $('td', this.dataTable.fnGetNodes()[i])[4]; + var checkTd = $('td', this.displayNodes[i])[1]; + var macTd = $('td', this.displayNodes[i])[1]; + var switchIpTd = $('td', this.displayNodes[i])[2]; + var vlanTd = $('td', this.displayNodes[i])[3]; + var portTd = $('td', this.displayNodes[i])[4]; var mac = macTd.textContent || macTd.innerText; var switch_ip = switchIpTd.textContent || switchIpTd.innerText; @@ -242,29 +254,25 @@ steal( 'div.add click': function(el, ev) { var tbody = el.closest('tbody'); - tbody.append(this.view('switch_row')); - if (!$("#useSNMP:checked").val()) { - $(".switch_row").last().find(".snmp").hide(); - $(".switch_row").last().find(".community").hide(); - $(".switch_row").last().find(".username").show(); - $(".switch_row").last().find(".password").show(); - } + tbody.append(""); + var tr = tbody.find("tr:last"); + tr.ods_ui_switch_entry({ + "odsState": this.options.odsState, + "switchData": null + }); }, - 'div.remove click': function(el, ev) { - var row = el.closest('tr'); - row.remove(); - }, - - 'a.find_server click': function(el, ev) { + '.find_server click': function(el, ev) { // remove the error class within the el $('.switchtable').find('.error').removeClass('error'); $(".switchesErr").hide(); + this.dataTable.fnClearTable(); + var self = this; var hasError = false; - this.pendingSwitchList.length = 0; + this.queryCount = 0; // return if the switch_ip/community or username/password input is empty @@ -273,6 +281,7 @@ steal( hasError = true; } }); + // return if the ip format is not correct $('.switchtable').find('.switchIp').each(function(index, value) { var isValid = self.validateIpFormat($(value).val()); if (!isValid) { @@ -287,269 +296,44 @@ steal( } $("#finding-servers").css("opacity", 1); + $('.find_server').attr("disabled", true); + $('.find_server').html("Finding..."); - var switch_count = $(".switch_row").length; - this.pendingCount = switch_count; - this.switches = []; + $('.switchtable').find('tr.switch_row').each(function(index, value) { + $(value).controller().findServers(); + }); - // loop through switch rows to create new switches - for (i = 0; i < switch_count; i++) { - var switch_ip = $(".switch_row").eq(i).find(".switchIp"); - var snmp_version = null, - community = null; - var username = null, - password = null; - var switchData = {}; - if ($("#useSNMP:checked").val()) { - this.options.odsState.snmp = 1; - snmp_version = $(".switch_row").eq(i).find(".snmp"); - community = $(".switch_row").eq(i).find(".community"); - switchData = { - "switch": { - "ip": switch_ip.val(), - "credential": { - 'version': snmp_version.val(), - 'community': community.val() - } - } - }; - } else { - this.options.odsState.snmp = 0; - username = $(".switch_row").eq(i).find(".username"); - password = $(".switch_row").eq(i).find(".password"); - switchData = { - "switch": { - "ip": switch_ip.val(), - "credential": { - "username": username.val(), - "password": password.val() - } - } - }; + setTimeout(this.proxy('checkSwitchesStatus'), 2000); + }, + + checkSwitchesStatus: function() { + var switchesFinished = true; + $('.switchtable').find('tr.switch_row').each(function(index, value) { + var status = $(value).controller().getSwitchStatus(); + if(status.status == 1) { + switchesFinished = false; } - - this.switches.push(switchData); - - Ods.Switch.create(switchData, this.proxy('onSwitchCreated', i), this.proxy('onSwitchCreateErr', i)); - } - this.options.odsState.switches = this.switches; - - }, - - 'input.switchIp keyup': function(el, ev) { - var isValid = this.validateIpFormat(el.val()); - if (!isValid) { - el.addClass("error"); - } else { - el.removeClass("error"); - } - }, - - validateIpFormat: function(value) { - var ipformat = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/; - if (value.match(ipformat)) { - return true; - } else { - return false; - } - }, - - /************************************/ - // switch create success callback - /************************************/ - onSwitchCreated: function(switchIndex, data, textStatus, xhr) { - steal.dev.log(" *** onSwitchCreated data *** ", data); - steal.dev.log(" *** onSwitchCreated textStatus *** ", textStatus); - steal.dev.log(" *** onSwitchCreated xhr *** ", xhr); - - this.pendingCount--; - if (xhr.status == 202) { // accepted - var switchId = data. - switch.id; - this.pendingSwitchList.push(switchId); - } - - if (this.pendingCount == 0) { - this.checkSwitchState(); - } - }, - - /************************************/ - // switch create error callback - /************************************/ - onSwitchCreateErr: function(switchIndex, xhr, status, statusText) { - steal.dev.log(" *** onSwitchCreatErr xhr *** ", xhr); - steal.dev.log(" *** onSwitchCreatErr status *** ", status); - steal.dev.log(" *** onSwitchCreatErr statusText *** ", xhr); - - $("#finding-servers").css("opacity", 0); - - if (xhr.status == 409) { // duplicate - var failedSwitchId = 0; - if ($.fixture.on == true) { - failedSwitchId = statusText.failedSwitch; - } else { - failedSwitchId = JSON.parse(xhr.responseText).failedSwitch; - } - steal.dev.log(" *** failed Switch Id *** ", failedSwitchId); - // PUT switches - Ods.Switch.update(failedSwitchId, this.switches[switchIndex], - this.proxy('onSwitchUpdated', switchIndex), this.proxy('onSwitchUpdateErr')); - - } else if (xhr.status == 400) { //bad request - $(".switchesErr").html("Switch post error code: 400"); - $(".switchesErr").show(); - } else if (xhr.status == 500) { // internal server error - $(".switchesErr").html("Switch post error code: 500"); - $(".switchesErr").show(); - } - - }, - - /************************************/ - // switch update success callback - /************************************/ - onSwitchUpdated: function(switchIndex, data, textStatus, xhr) { - steal.dev.log(" *** onSwitchUpdated data *** ", data); - steal.dev.log(" *** onSwitchUpdated textStatus *** ", textStatus); - steal.dev.log(" *** onSwitchUpdated xhr *** ", xhr); - - this.pendingCount--; - - if (xhr.status == 202 || xhr.status == 200) { // accepted or OK - var switchId = data. - switch.id; - this.pendingSwitchList.push(switchId); - } - - if (this.pendingCount == 0) { - this.checkSwitchState(); - } - - }, - - /************************************/ - // switch create error callback - /************************************/ - onSwitchUpdateErr: function(xhr, status, statusText) { - steal.dev.log(" *** onSwitchUpdateErr xhr *** ", xhr); - steal.dev.log(" *** onSwitchUpdateErr status *** ", status); - steal.dev.log(" *** onSwitchUpdateErr statusText *** ", statusText); - - $("#finding-servers").css("opacity", 0); - - if (xhr.status == 404) { // not found - $(".switchesErr").html("Switch update error code: 404"); - $(".switchesErr").show(); - } else if (xhr.status == 400) { // bad request - $(".switchesErr").html("Switch update error code: 400"); - $(".switchesErr").show(); - } else if (xhr.status == 500) { // internal server error - $(".switchesErr").html("Switch update error code: 500"); - $(".switchesErr").show(); - } - - }, - - checkSwitchState: function() { - this.queryCount++; - this.pendingCount = this.pendingSwitchList.length; - - if (this.queryCount > 10) { - $(".switchesErr").html("There is(are) " + this.pendingCount + " switch(es) not responding now. Please try again later.") - $(".switchesErr").show(); + }) + if (switchesFinished) { $("#finding-servers").css("opacity", 0); - return; - } - - var switches = this.pendingSwitchList; - this.pendingSwitchList = []; - var count = this.pendingCount; - for (var i = 0; i < count; i++) { - Ods.Switch.findOne(switches[i], this.proxy('onFindOneSwitch'), this.proxy('onFindOneSwitchErr')); + $('.find_server').attr("disabled", false); + $('.find_server').html("Find Servers"); + } else { + setTimeout(this.proxy('checkSwitchesStatus'), 2000); } }, - /************************************/ - // find one switch success callback - /************************************/ - onFindOneSwitch: function(data, textStatus, xhr) { - steal.dev.log(" *** onFindOneSwitch data *** ", data); - steal.dev.log(" *** onFindOneSwitch textStatus *** ", textStatus); - steal.dev.log(" *** onFindOneSwitch xhr *** ", xhr); - this.pendingCount--; - - if (xhr.status == 200) { //OK - if (data.switch.state === "under_monitoring") { - this.element.find('div.right-side').show(); - this.dataTable.fnClearTable(); - - this.getServersBySwitch(data.switch.id); - } else { - this.pendingSwitchList.push(data.switch.id); - } - } - - if (this.pendingCount == 0) { - setTimeout(this.proxy('checkSwitchState'), 2000); - } - }, - - /************************************/ - // find one switch error callback - /************************************/ - onFindOneSwitchErr: function(xhr, status, statusText) { - steal.dev.log(" *** onFindOneSwitchErr xhr *** ", xhr); - steal.dev.log(" *** onFindOneSwitchErr status *** ", status); - steal.dev.log(" *** onFindOneSwitchErr statusText *** ", statusText); - - $("#finding-servers").css("opacity", 0); - if (xhr.status == 404) { // not found - $(".switchesErr").html("Find switch error code: 404"); - $(".switchesErr").show(); - } else if (xhr.status == 500) { - $(".switchesErr").html("Find switch error code: 500"); - $(".switchesErr").show(); - } - - }, - - getServersBySwitch: function(id) { - Ods.Server.findAll({ - switchId: id - }, this.proxy('onFindAllServers')); - }, - - /************************************/ - // find all servers success callback - /************************************/ - onFindAllServers: function(data, textStatus, xhr) { - steal.dev.log(" *** onFindAllServers data *** ", data); - steal.dev.log(" *** onFindAllServers textStatus *** ", textStatus); - steal.dev.log(" *** onFindAllServers xhr *** ", xhr); - - this.dataTable.fnAddData(data.machines); - - this.machines = this.machines.concat(data.machines); - - if (this.pendingCount == 0 && this.pendingSwitchList.length == 0) { - steal.dev.log("loading finished"); - $("#finding-servers").css("opacity", 0); + onNewMachines: function(machines) { + this.element.find('div.right-side').show(); + if (machines.length > 0) { + this.dataTable.fnAddData(machines); + this.machines = this.machines.concat(machines); this.options.odsState.machines = this.machines; } }, - checkNonEmpty: function(el) { - var value = el.val(); - if (!value) { - el.addClass('error'); - return false; - } - return true; - }, - /************************************/ // add server to cluster success callback /************************************/ @@ -621,6 +405,33 @@ steal( this.countCheckedServers(); }, + 'input.switchIp keyup': function(el, ev) { + var isValid = this.validateIpFormat(el.val()); + if (!isValid) { + el.addClass("error"); + } else { + el.removeClass("error"); + } + }, + + validateIpFormat: function(value) { + var ipformat = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/; + if (value.match(ipformat)) { + return true; + } else { + return false; + } + }, + + checkNonEmpty: function(el) { + var value = el.val(); + if (!value) { + el.addClass('error'); + return false; + } + return true; + }, + show: function() { this.element.show(); diff --git a/public/ods/ui/servers/views/init.ejs b/public/ods/ui/servers/views/init.ejs index 9868c87..0872378 100644 --- a/public/ods/ui/servers/views/init.ejs +++ b/public/ods/ui/servers/views/init.ejs @@ -19,26 +19,12 @@ - - - - - - - - - - -
- +
- Find Servers +