cyclades, pithos: Update resource definitions

Include service_type in each resource dict.

snf-cyclades-app/synnefo/quotas/management/commands/resource-export-cyclades.py

@@ -40,7 +40,5 @@ class Command(NoArgsCommand):
     help = "Export Cyclades resources in JSON format."
 
     def handle(self, *args, **options):
-        data = {"service": resources.service,
-                "resources": resources.resources}
-        output = json.dumps(data, indent=4)
+        output = json.dumps(resources.resources, indent=4)
         self.stdout.write(output + "\n")

snf-cyclades-app/synnefo/quotas/resources.py

-service = "cyclades"
 
 resources =\
     [{"name": "cyclades.vm",
-      "desc": "Number of virtual machines"},
+      "desc": "Number of virtual machines",
+      "service_type": "compute",
+      },
      {"name": "cyclades.cpu",
-      "desc": "Number of virtual machine processors"},
+      "desc": "Number of virtual machine processors",
+      "service_type": "compute",
+      },
      {"name": "cyclades.ram",
       "desc": "Virtual machine memory size",
-      "unit": "bytes"},
+      "unit": "bytes",
+      "service_type": "compute",
+      },
      {"name": "cyclades.disk",
       "desc": "Virtual machine disk size",
-      "unit": "bytes"},
+      "unit": "bytes",
+      "service_type": "compute",
+      },
      {"name": "cyclades.network.private",
-      "desc": "Number of private networks"}]
+      "desc": "Number of private networks",
+      "service_type": "compute",
+      }]

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

@@ -41,8 +41,5 @@ class Command(BaseCommand):
     help = "Export pithos resources in json format"
 
     def handle(self, *args, **options):
-        data = {'service': resources.service,
-                'resources': resources.resources,
-                }
-        output = json.dumps(data, indent=4)
+        output = json.dumps(resources.resources, indent=4)
         self.stdout.write(output + '\n')

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

@@ -31,11 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-service = "pithos"
 
 resources = [
     {"desc": "Pithos account diskspace",
      "name": "pithos.diskspace",
      "unit": "bytes",
+     "service_type": "object-store",
      }
 ]