occi: random fixes

circle/occi/occi.py

@@ -5,7 +5,7 @@ from vm.models import Instance, Lease
 from vm.models.common import ARCHITECTURES
 from vm.models.common import ARCHITECTURES
 from vm.models.instance import ACCESS_METHODS
 from vm.models.instance import ACCESS_METHODS
 
 
-OCCI_ADDR = "http://pc3.szgt.uni-miskolc.hu:5863/"
+OCCI_ADDR = "https://miskolc.cloud.bme.hu:12598/"
 
 
 
 
 class Category():
 class Category():
@@ -30,11 +30,13 @@ class Category():
     def render_values(self):
     def render_values(self):
         ret = "%s;" % self.term
         ret = "%s;" % self.term
 
 
-        simple_arguments = ["scheme", "class", "title", "rel", "location"]
+        simple_arguments = ["scheme", "class", "title", "rel"]
         for i in simple_arguments:
         for i in simple_arguments:
             if hasattr(self, i):
             if hasattr(self, i):
                 ret += ' %s="%s";' % (i, getattr(self, i))
                 ret += ' %s="%s";' % (i, getattr(self, i))
 
 
+        if hasattr(self, "location"):
+            ret += ' location="%s";' % (self.location % OCCI_ADDR)
         if hasattr(self, "attributes"):
         if hasattr(self, "attributes"):
             ret += ' attributes="%s";' % " ".join(
             ret += ' attributes="%s";' % " ".join(
                 [a.render() for a in self.attributes])
                 [a.render() for a in self.attributes])
@@ -87,7 +89,7 @@ class Compute(Resource):
     def __init__(self, instance=None, attrs=None, **kwargs):
     def __init__(self, instance=None, attrs=None, **kwargs):
         self.attrs = {}
         self.attrs = {}
         if instance:
         if instance:
-            self.location = "%socci/vm/%d" % (OCCI_ADDR, instance.pk)
+            self.location = "%socci/vm/%d/" % (OCCI_ADDR, instance.pk)
             self.instance = instance
             self.instance = instance
             self.init_attrs()
             self.init_attrs()
         elif attrs:
         elif attrs:
@@ -95,6 +97,7 @@ class Compute(Resource):
             self._create_object()
             self._create_object()
 
 
     translate = {
     translate = {
+        'occi.core.id': "id",
         'occi.compute.architecture': "arch",
         'occi.compute.architecture': "arch",
         'occi.compute.cores': "num_cores",
         'occi.compute.cores': "num_cores",
         'occi.compute.hostname': "short_hostname",
         'occi.compute.hostname': "short_hostname",
@@ -124,10 +127,10 @@ class Compute(Resource):
         params['name'] = "from occi yo"
         params['name'] = "from occi yo"
         i = Instance.create(params=params, disks=[], networks=[],
         i = Instance.create(params=params, disks=[], networks=[],
                             req_traits=[], tags=[])
                             req_traits=[], tags=[])
-        self.location = "%socci/vm/%d" % (OCCI_ADDR, i.pk)
+        self.location = "%socci/vm/%d/" % (OCCI_ADDR, i.pk)
 
 
     def render_location(self):
     def render_location(self):
-        return "X-OCCI-Location: %s" % self.location
+        return "%s" % self.location
 
 
     def render_body(self):
     def render_body(self):
         kind = COMPUTE_KIND
         kind = COMPUTE_KIND

circle/occi/templates/occi/compute.html

-Category: compute; scheme={{ kind.scheme }}; class="{{ kind.class }}";
+Category: compute; scheme="{{ kind.scheme }}"; class="{{ kind.class }}";
 {% spaceless %}
 {% spaceless %}
 {% for k, v in attrs.items %}
 {% for k, v in attrs.items %}
-X-OCCI-Attribute: {{ k }}={% if v.isdigit == False %}"{{ v }}"{% else %}{{ v }}{% endif %}{% endfor %}
+X-OCCI-Attribute: {{ k }}={% if v.isdigit == False or k == "occi.core.id" %}"{{ v }}"{% else %}{{ v }}{% endif %}{% endfor %}
 {% endspaceless %}
 {% endspaceless %}