common: Export only services specified as public

Employ helper function `filter_public' in service-export-* commands.
Also set `pithos_ui' service to non-public and clear version of
`astakos_ui'.

astakosclient/astakosclient/services.py

@@ -59,7 +59,7 @@ astakos_services = {
         'prefix': 'ui',
         'public': False,
         'endpoints': [
-            {'versionId': 'v1.0',
+            {'versionId': '',
              'publicURL': None},
         ]},
 }

snf-astakos-app/astakos/im/management/commands/service-export-astakos.py

@@ -35,11 +35,12 @@ from django.utils import simplejson as json
 from django.core.management.base import NoArgsCommand
 # import from settings, after any post-processing
 from astakos.im.settings import astakos_services
+from synnefo.lib.services import filter_public
 
 
 class Command(NoArgsCommand):
     help = "Export Astakos services in JSON format."
 
     def handle(self, *args, **options):
-        output = json.dumps(astakos_services, indent=4)
+        output = json.dumps(filter_public(astakos_services), indent=4)
         self.stdout.write(output + "\n")

snf-common/synnefo/lib/services.py

@@ -31,6 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+from copy import deepcopy
 from synnefo.lib import join_urls
 from synnefo.util.keypath import get_path, set_path
 
@@ -47,3 +48,11 @@ def fill_endpoints(services, base_url):
 
             publicURL = join_urls(base_url, prefix, version)
             set_path(endpoint, 'publicURL', publicURL)
+
+
+def filter_public(services):
+    public_services = {}
+    for name, service in services.iteritems():
+        if service.get('public', False):
+            public_services[name] = deepcopy(service)
+    return public_services

snf-cyclades-app/synnefo/api/management/commands/service-export-cyclades.py

@@ -34,11 +34,12 @@
 from django.utils import simplejson as json
 from django.core.management.base import NoArgsCommand
 from synnefo.cyclades_settings import cyclades_services
+from synnefo.lib.services import filter_public
 
 
 class Command(NoArgsCommand):
     help = "Export Cyclades services in JSON format."
 
     def handle(self, *args, **options):
-        output = json.dumps(cyclades_services, indent=4)
+        output = json.dumps(filter_public(cyclades_services), indent=4)
         self.stdout.write(output + "\n")

snf-pithos-app/pithos/api/management/commands/service-export-pithos.py

@@ -34,11 +34,12 @@
 from django.utils import simplejson as json
 from django.core.management.base import NoArgsCommand
 from pithos.api.settings import pithos_services
+from synnefo.lib.services import filter_public
 
 
 class Command(NoArgsCommand):
     help = "Export Pithos services in JSON format."
 
     def handle(self, *args, **options):
-        output = json.dumps(pithos_services, indent=4)
+        output = json.dumps(filter_public(pithos_services), indent=4)
         self.stdout.write(output + "\n")

snf-pithos-app/pithos/api/services.py

@@ -57,7 +57,7 @@ pithos_services = {
         'type': 'pithos_ui',
         'component': 'pithos',
         'prefix': 'ui',
-        'public': True,
+        'public': False,
         'endpoints': [
             {'versionId': '',
              'publicURL': None},