From 2616b13381f2201d67c5c551fce438817502e5b7 Mon Sep 17 00:00:00 2001 From: Javier Garcia Date: Fri, 18 Sep 2015 14:22:58 +0200 Subject: [PATCH] SLA plugin: fixed SSL certificate error --- sla/slaclient/restclient.py | 2 +- sla/slicetabsla.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py index 4b8614be..0f08a993 100755 --- a/sla/slaclient/restclient.py +++ b/sla/slaclient/restclient.py @@ -166,7 +166,7 @@ class Client(object): kwargs["auth"] = HTTPBasicAuth(settings.SLA_COLLECTOR_USER, settings.SLA_COLLECTOR_PASSWORD) - result = requests.post(url, data, **kwargs) + result = requests.post(url, data, verify=False, **kwargs) location = result.headers["location"] \ if "location" in result.headers else "" print "POST {} {} - Location: {}".format( diff --git a/sla/slicetabsla.py b/sla/slicetabsla.py index cc26b254..1dbb428a 100755 --- a/sla/slicetabsla.py +++ b/sla/slicetabsla.py @@ -242,19 +242,13 @@ class AgreementTemplates(FreeAccessView, ThemeView): c = restclient.Templates(SLA_COLLECTOR_URL) testbed = kwargs.get('testbed', None) - #logger.debug("AAAAA testbed: {}".format(testbed)) - templates, response = c.getall(testbed) service_level_objectives = [] - #logger.debug("BBBBB templates: {}".format(templates)) - for template in templates: service_level_objectives.append( [v.servicelevelobjective for v in template.guaranteeterms.values()]) - logger.debug("CCCCC slo: {}".format(service_level_objectives)) - return HttpResponse(service_level_objectives, content_type="application/json", status=response.status_code) class CreateAgreement(LoginRequiredView, ThemeView): @@ -277,7 +271,7 @@ class CreateAgreement(LoginRequiredView, ThemeView): dt = datetime.fromtimestamp(float(tstmp)) # gmt_2 = pytz.timezone("Etc/GMT-2") # dlocal = gmt_2.localize(dt).isoformat() - dlocal = dt.isoformat() + "CET" # FIXME: hardcoded for demo purposes + dlocal = dt.isoformat() + "CET" data["SLIVER_INFO_EXPIRATION"] = dlocal # logger.debug("SLA Agreement parameters: {}".format(data.dict())) -- 2.43.0