X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmanagers%2Faggregate_manager.py;h=bb9559f089973b4ac7365d6efdc7f570c0652e8e;hb=24d030ea7387032811248f7f48aeb9bdd7c04ca5;hp=a8c3af4b89b6d104ae5fb0e83078d93b7def77ee;hpb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;p=sfa.git

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index a8c3af4b..bb9559f0 100644
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -1,4 +1,5 @@
-import socket
+# pylint: disable=c0111, c0103, r0201
+
 from sfa.rspecs.version_manager import VersionManager
 from sfa.util.version import version_core
 from sfa.util.xrn import Xrn
@@ -10,7 +11,8 @@ from sfa.server.api_versions import ApiVersions
 
 class AggregateManager:
 
-    def __init__(self, config): pass
+    def __init__(self, config):
+        pass
 
     # essentially a union of the core version, the generic version (this code) and
     # whatever the driver needs to expose
@@ -20,6 +22,15 @@ class AggregateManager:
         ad_rspec_versions = []
         request_rspec_versions = []
         for rspec_version in version_manager.versions:
+            # avoid publishing non-relevant entries
+            # but stay safe however
+            try:
+                if not rspec_version.extensions \
+                  and not rspec_version.namespace \
+                  and not rspec_version.schema:
+                    continue
+            except Exception as exc:
+                pass
             if rspec_version.content_type in ['*', 'ad']:
                 ad_rspec_versions.append(rspec_version.to_dict())
             if rspec_version.content_type in ['*', 'request']:
@@ -57,8 +68,8 @@ class AggregateManager:
         cred_types = [{'geni_type': 'geni_sfa',
                        'geni_version': str(i)} for i in range(4)[-2:]]
         geni_api_versions = ApiVersions().get_versions()
-        geni_api_versions[
-            '3'] = 'http://%s:%s' % (api.config.sfa_aggregate_host, api.config.sfa_aggregate_port)
+        geni_api_versions['3'] = \
+            'https://%s:%s' % (api.config.sfa_aggregate_host, api.config.sfa_aggregate_port)
         version_generic = {
             'testbed': api.driver.testbed_name(),
             'interface': 'aggregate',
@@ -127,7 +138,7 @@ class AggregateManager:
 
     def Allocate(self, api, xrn, creds, rspec_string, expiration, options):
         """
-        Allocate resources as described in a request RSpec argument 
+        Allocate resources as described in a request RSpec argument
         to a slice with the named URN.
         """
         call_id = options.get('call_id')
@@ -137,7 +148,7 @@ class AggregateManager:
 
     def Provision(self, api, xrns, creds, options):
         """
-        Create the sliver[s] (slice) at this aggregate.    
+        Create the sliver[s] (slice) at this aggregate.
         Verify HRN and initialize the slice record in PLC if necessary.
         """
         call_id = options.get('call_id')