From: Yasin SLA description SLA description to be deployed '+arrayselectedresources[iter].toLowerCase()+' SLA description Testbed guarantees 0.99 Uptime rate for 0.99 rate of the VirtualWall resources during the sliver lifetime";
for(var iter = 0; iter < arrayselectedresources.length; iter++){
- var list = '
";
//var wallmessage = '
';
+ var list = '";
for(var iter = 0; iter < arrayselectedresources.length; iter++){
- var list = '
Testbed guarantees 0.99 Uptime rate for 0.99 rate of the WiLab2 resources during the sliver lifetime
'); promt.append(wilabForm); + promt.append('Testbed guarantees 0.99 Uptime rate for 0.99 rate of the VirtualWall resources during the sliver lifetime
'); promt.append(wallForm); + promt.append(''+record["network_hrn"]+'
'; - $('#testbeds-filter').append(row); + var self = this; + // If the resource has a network_hrn + if(record["network_hrn"]!="None" && record["network_hrn"]!="" && record["network_hrn"]!=null){ + // If this network_hrn is not listed yet + if(jQuery.inArray(record["network_hrn"],self.testbeds)==-1){ + row = ''; + //row += ''+record["platform"]+''; + //row += ''+record["network_hrn"]+''; + row += ''+record["network_hrn"]+'
'; + $('#testbeds-filter').append(row); + self.testbeds.push(record["network_hrn"]); + } + } }, - /* When the network query is done, add the click event to the elements */ - on_network_query_done: function() { + /* When the query is done, add the click event to the elements */ + on_all_query_done: function() { var self = this; console.log('query network DONE'); $("[id^='testbeds-filter_']").on('click',function(e) { diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index 1ea6eada..5b8ce0f7 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -202,8 +202,8 @@ class SliceResourceView (LoginRequiredView, ThemeView): network_md = metadata.details_by_object('network') network_fields = [column['name'] for column in network_md['column']] - query_network = Query.get('network').select(network_fields) - page.enqueue_query(query_network) + #query_network = Query.get('network').select(network_fields) + #page.enqueue_query(query_network) filter_testbeds = TestbedsPlugin( page = page, @@ -211,7 +211,7 @@ class SliceResourceView (LoginRequiredView, ThemeView): title = 'Filter by testbeds', query = sq_resource, query_all = query_resource_all, - query_network = query_network, + #query_network = query_network, init_key = "network_hrn", checkboxes = True, datatables_options = { diff --git a/portal/static/css/fed4fire.css b/portal/static/css/fed4fire.css index fd9bc193..5633f19f 100644 --- a/portal/static/css/fed4fire.css +++ b/portal/static/css/fed4fire.css @@ -488,11 +488,11 @@ div#appservices div.row { padding: 15px 15px; } -div.portfolio-item { - +div.portfolio-item img{ + width: 150px; } div.portfolio-item p[id*='name-'] { font-weight: bold; cursor: pointer; -} \ No newline at end of file +} diff --git a/portal/static/img/servicedirectory/hadoop.png b/portal/static/img/servicedirectory/hadoop.png new file mode 100755 index 00000000..5e8affe8 Binary files /dev/null and b/portal/static/img/servicedirectory/hadoop.png differ diff --git a/portal/static/img/servicedirectory/smartsantander.png b/portal/static/img/servicedirectory/smartsantander.png new file mode 100755 index 00000000..806e459e Binary files /dev/null and b/portal/static/img/servicedirectory/smartsantander.png differ diff --git a/portal/templates/base.html b/portal/templates/base.html index decd041e..af81a0ed 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -3,7 +3,7 @@').text(item.name), diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index cdada8a5..9d1306b1 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -117,6 +117,7 @@ class Client(object): result = requests.get(url, **kwargs) print "GET {} {} {}".format( result.url, result.status_code, result.text[0:70]) + return result def post(self, path, data=None, **kwargs): @@ -279,9 +280,20 @@ class Agreements(object): """ path = _buildpath_(agreementid, "guaranteestatus") r = self.res.client.get(path, headers={'accept': 'application/json'}) + + print "---- JSON Response ----" + print r.text + json_obj = r.json() + print "-- json_obj() --" + print type(json_obj) + print json_obj + status = wsag_model.AgreementStatus.json_decode(json_obj) + print "---- STATUS ----" + print status + return status, r def create(self, agreement):