occi: rename remaining disk strings to storage

circle/occi/occi.py

@@ -453,7 +453,8 @@ class StorageLink(Link):
 
 
     def init_attrs(self, instance, disk):
     def init_attrs(self, instance, disk):
         self.attrs = {}
         self.attrs = {}
-        self.attrs['occi.core.id'] = "vm_%d_disk_%d" % (instance.pk, disk.pk)
+        self.attrs['occi.core.id'] = "vm_%d_storage_%d" % (instance.pk,
+                                                           disk.pk)
         self.attrs['occi.core.target'] = Storage(disk).render_location()
         self.attrs['occi.core.target'] = Storage(disk).render_location()
         self.attrs['occi.core.source'] = Compute(instance).render_location()
         self.attrs['occi.core.source'] = Compute(instance).render_location()
         # deviceid? mountpoint?
         # deviceid? mountpoint?

circle/occi/urls.py

@@ -36,7 +36,7 @@ urlpatterns = patterns(
     url(r'^storage/(?P<pk>\d+)/?$', DiskInterface.as_view(), name="occi.disk"),
     url(r'^storage/(?P<pk>\d+)/?$', DiskInterface.as_view(), name="occi.disk"),
 
 
     url(r'^link/storagelink/$', StorageLinkInterface.as_view()),
     url(r'^link/storagelink/$', StorageLinkInterface.as_view()),
-    url(r'^link/storagelink/vm(?P<vm_pk>\d+)_disk(?P<disk_pk>\d+)/?$',
+    url(r'^link/storagelink/vm_(?P<vm_pk>\d+)_storage_(?P<disk_pk>\d+)/?$',
         StorageLinkInterface.as_view(), name="occi.storagelink"),
         StorageLinkInterface.as_view(), name="occi.storagelink"),
 
 
     url(r'^network2/?$', NetworkInterfaceView.as_view(), ),
     url(r'^network2/?$', NetworkInterfaceView.as_view(), ),