updated CSD backend

opennsa/backends/junoscsd.py

@@ -165,11 +165,6 @@ def _extractErrorMessage(failure):
         return failure.getErrorMessage()
 
 
-class WebClientContextFactory(opennsaTlsContext):
-    def getContext(self):
-        return opennsaTlsContext.getContext(self)
-
-
 class CSDConnectionManager:
 
     def __init__(self, port_map, space_user, space_password, space_api_url, space_routers, csd_service_def, csd_customer_id, network_name, csd_descriptions):
@@ -224,11 +219,12 @@ class CSDConnectionManager:
         headers["Content-Type"] = "application/vnd.net.juniper.space.service-management.service-order+xml;version=2;charset=UTF-8"
         headers["Authorization"] = self._createAuthzHeader()
         return headers
+          
 
     def setupLink(self, connection_id, source_target, dest_target, bandwidth):
         payload = createCSDPayload(connection_id, source_target, dest_target, self.csd_service_def, self.csd_customer_id, self.space_routers, self.csd_descriptions)
         headers = self._createHeaders()
-        contextFactory = WebClientContextFactory(config.DEFAULT_CERTIFICATE_DIR, None)
+        contextFactory = opennsaTlsContext(config.DEFAULT_CERTIFICATE_DIR, False)
 
         def linkUp(data):
             log.msg('Link %s -> %s up' % (source_target, dest_target), system=LOG_SYSTEM)
@@ -250,7 +246,7 @@ class CSDConnectionManager:
         headers["Accept"] = "*/*"
         headers["Authorization"] = self._createAuthzHeader()
         serviceID = None
-        contextFactory = WebClientContextFactory(config.DEFAULT_CERTIFICATE_DIR, None)
+        contextFactory = opennsaTlsContext(config.DEFAULT_CERTIFICATE_DIR, False)
 
         def linkDown(data):
             log.msg('Link %s -> %s down' % (source_target, dest_target), system=LOG_SYSTEM)
@@ -265,7 +261,7 @@ class CSDConnectionManager:
             headers = {}
             #headers["Content-Type"] = "application/vnd.net.juniper.space.service-management.service-order+xml;version=2;charset=UTF-8"
             headers["Authorization"] = self._createAuthzHeader()
-            contextFactory = WebClientContextFactory(config.DEFAULT_CERTIFICATE_DIR, None)
+            contextFactory = opennsaTlsContext(config.DEFAULT_CERTIFICATE_DIR, False)
             serviceID = 0
             nsmap={'a': 'services.schema.networkapi.jmp.juniper.net'}
             services = etree.fromstring(data).xpath("/a:Data/a:ServiceResource/a:Service", namespaces=nsmap)