10-01-2012

Author: all4innov

README

@@ -1,4 +1,4 @@
-pyocni Readme
+pyocni README
 -------------
 
 Copyright (C) Houssem Medhioub <[email protected]>
@@ -70,6 +70,7 @@ python start.py
 -----------------------------------------------------------------------------
 Retrieval of all registered Kinds and Mixins:
 curl -X GET -H 'accept: application/json:occi' -v http://localhost:8090/-/
+__________________________________________________________________________________________________________________
 
 Creation of Resource instance (compute)
 curl -X POST -d@post_compute.json -H 'content-type: application/json:occi' -v http://localhost:8090/compute/
@@ -85,6 +86,7 @@ curl -X POST -d@post_clonenode_openflow.json -H 'content-type: application/json:
 
 Creation of Resource instance (CloNeLink) with l3vpn Mixin
 curl -X POST -d@post_clonelink_l3vpn.json -H 'content-type: application/json:occi' -v http://localhost:8090/CloNeLink/
+__________________________________________________________________________________________________________________
 
 Retrieval of Resource instance (Compute)
 curl -X GET -H 'accept: application/json:occi' -v http://localhost:8090/compute/user1/compute1
@@ -97,7 +99,14 @@ curl -X GET -H 'accept: application/json:occi' -v http://localhost:8090/CloNeLin
 
 Retrieval of all resource instance below a path
 curl -X GET -H 'accept: application/json:occi' -v http://localhost:8090/CloNeNode/user1/
+__________________________________________________________________________________________________________________
 
+UPDATE of Resource instance (CloNeLink) with l3vpn Mixin
+curl -X PUT -d@post_clonelink_l3vpn.json -H 'accept: application/json:occi' -v http://localhost:8090/CloNeLink/user1/CloNeLink1
+__________________________________________________________________________________________________________________
+
+Delete of Resource instance (CloNeLink) with l3vpn Mixin
+curl -X DELETE -H 'accept: application/json:occi' -v http://localhost:8090/CloNeLink/user1/CloNeLink1
 
 -----------------------------------------------------------------------------
 5. For developers

pyocni/backend/opennebula_backend.py

@@ -42,26 +42,26 @@ def create(self, entity):
 
         logger.debug('The create operation of the opennebula_backend')
 
-        f = open('/tmp/template', 'w')
-        f.write('Name = ' + str(entity.occi_compute_hostname) + '\n')
-        f.write('CPU = ' + str(entity.occi_compute_cores) + '\n')
-        f.write('MEMORY = ' + str(entity.occi_compute_memory) + '\n')
-        f.write('DISK = [ IMAGE_ID = 1,\n')
-        f.write('  target = "hda",\n')
-        f.write('  readonly = "no"]\n')
-        f.write('OS = [ ARCH = ' + str(entity.occi_compute_architecture) + ' ]\n')
-        f.write('FEATURE = [ acpi = "yes"]\n')
-        f.write('NIC = [ NETWORK_ID = 3 ]\n')
-        f.write('GRAPHICS = [ type = "vnc", listen="127.0.0.1", port="-1"]\n')
-
-        #print f.read()
-
-        templateID=commands.getstatusoutput('onetemplate create /tmp/template')
-        print templateID
-        rt=commands.getstatusoutput('onetemplate instanciate ' + str(templateID))
-        print rt
-        f.close()
-        print '###########################################################################'
+#        f = open('/tmp/template', 'w')
+#        f.write('Name = ' + str(entity.occi_compute_hostname) + '\n')
+#        f.write('CPU = ' + str(entity.occi_compute_cores) + '\n')
+#        f.write('MEMORY = ' + str(entity.occi_compute_memory) + '\n')
+#        f.write('DISK = [ IMAGE_ID = 1,\n')
+#        f.write('  target = "hda",\n')
+#        f.write('  readonly = "no"]\n')
+#        f.write('OS = [ ARCH = ' + str(entity.occi_compute_architecture) + ' ]\n')
+#        f.write('FEATURE = [ acpi = "yes"]\n')
+#        f.write('NIC = [ NETWORK_ID = 3 ]\n')
+#        f.write('GRAPHICS = [ type = "vnc", listen="127.0.0.1", port="-1"]\n')
+#
+#        #print f.read()
+#
+#        templateID=commands.getstatusoutput('onetemplate create /tmp/template')
+#        print templateID
+#        rt=commands.getstatusoutput('onetemplate instanciate ' + str(templateID))
+#        print rt
+#        f.close()
+#        print '###########################################################################'
 
 
     def read(self, entity):

pyocni/ocni_server.py

@@ -19,9 +19,10 @@
 Created on Feb 25, 2011
 
 @author: Houssem Medhioub
+@author: Daniel Turull (DELETE and PUT of OperationResource class)
 @contact: [email protected]
 @organization: Institut Telecom - Telecom SudParis
-@version: 0.1
+@version: 0.3
 @license: LGPL - Lesser General Public License
 """
 
@@ -68,6 +69,7 @@
 from pyocni.backend.opennebula_backend import opennebula_backend
 from pyocni.backend.openstack_backend import openstack_backend
 
+from pyocni.pyocni_tools import ask_user_details as shell_ask
 
 # getting the Logger
 logger = config.logger
@@ -93,6 +95,15 @@
                'Not Implemented': 501,
                'Service Unavailable': 503}
 
+# ======================================================================================
+# Reinialization of the locations registry and objects registry (clear ZODB)
+# ======================================================================================
+result = shell_ask.query_yes_no_quit(" \n_______________________________________________________________\n"
+                                     "   Do you want to purge 'locations' and 'objects' Databases (DB  reinialization)?", "no")
+if result == 'yes':
+    location_registry().purge_locations_db()
+    location_registry().purge_objects_db()
+
 
 # ======================================================================================
 # the category registry
@@ -171,12 +182,30 @@
 location_registry().register_location("/OpenFlowCloNeNetworkInterface/", OpenFlowCloNeNetworkInterface())
 location_registry().register_location("/l3vpn/", l3vpn())
 
-# register backends
-backend_registry().register_backend(dummy_backend())
-backend_registry().register_backend(openflow_backend())
-backend_registry().register_backend(l3vpn_backend())
-backend_registry().register_backend(opennebula_backend())
-backend_registry().register_backend(openstack_backend())
+# ======================================================================================
+# the Backend registry
+# ======================================================================================
+
+result = shell_ask.query_yes_no_quit(" \n_______________________________________________________________\n"
+                                     "   Do you want to register the dummy backend ?", "yes")
+if result == 'yes':
+    backend_registry().register_backend(dummy_backend())
+result = shell_ask.query_yes_no_quit(" \n_______________________________________________________________\n"
+                                     "   Do you want to register the OpenFlow backend ?", "no")
+if result == 'yes':
+    backend_registry().register_backend(openflow_backend())
+result = shell_ask.query_yes_no_quit(" \n_______________________________________________________________\n"
+                                     "    Do you want to register the L3VPN backend ?", "no")
+if result == 'yes':
+    backend_registry().register_backend(l3vpn_backend())
+result = shell_ask.query_yes_no_quit(" \n_______________________________________________________________\n"
+                                     "    Do you want to register the OpenNebula backend ?", "no")
+if result == 'yes':
+    backend_registry().register_backend(opennebula_backend())
+result = shell_ask.query_yes_no_quit(" \n_______________________________________________________________\n"
+                                     "    Do you want to register the OpenStack backend ?", "no")
+if result == 'yes':
+    backend_registry().register_backend(openstack_backend())
 
 
 class QueryInterface(object):
@@ -240,7 +269,7 @@ def delete(self):
 # Operation on Paths in the Name-space
 # ======================================================================================
 #
-#   Retrieving All resource instances Below a Path
+#   Retrieving All resource instances Below a Path (DONE)
 #
 #   Deletion of all resource instances below a path
 class OperationPath(object):
@@ -308,13 +337,13 @@ def delete(self):
 # Operations on Resource Instances
 # ======================================================================================
 #
-#   Creating a resource instance
+#   Creating a resource instance (DONE)
 #
-#   Retrieving a resource instance
+#   Retrieving a resource instance (DONE)
 #
-#   Updating a resource instance
+#   Updating a resource instance (DONE)
 #
-#   Deleting a resource instance
+#   Deleting a resource instance (DONE)
 #
 #   Triggering an Action on a resource instance
 class OperationResource(object):
@@ -389,19 +418,48 @@ def post(self):
     def put(self):
         """
 
-        Creating a resource instance by providing the path in the name-space hierarchy
+        Creating a resource instance by providing the path in the name-space hierarchy (To do)
         Or
-        Updating a resource instance
+        Updating a resource instance (Done)
 
         """
+        # =1= get old resources
+        _old_resource = location_registry().get_object(self.req.path)
+        # =2= get new resources
+        resource_json_serializer = json_serializer.resource_serializer()
+        _resource = resource_json_serializer.from_json(self.req.body)
+
+        # =3= unregister old and register new
+        location_registry().unregister_location(self.req.path)
+        location_registry().register_location(self.req.path, _resource)
+
+        # =4= execute the backend command by sending the resource object
+        for _backend in backend_registry().get_backends().values():
+            _backend.update(_old_resource, _resource)
+
+        self.res.body = 'Resource ' + self.req.path + ' has been updated'
+
         return self.res
 
     def delete(self):
         """
 
-        Removing a Mixin definition
+        Deleting a resource instance
 
         """
+        # =1= get resources
+        _resource = location_registry().get_object(self.req.path)
+
+        # =2= remove resources
+        location_registry().unregister_location(self.req.path)
+
+        # =3= execute the backend command by sending the resource object
+        for _backend in backend_registry().get_backends().values():
+            _backend.delete(_resource)
+
+        # =4= return OK with the Location of the created resource
+        self.res.body = 'Resource with this PATH has been removed'
+
         return self.res
 
 # ======================================================================================
@@ -440,8 +498,14 @@ def run_server(self):
         to run the server
 
         """
+        print ("\n______________________________________________________________________________________\n"
+               "The OCNI server is running at: ")
         wsgi.server(eventlet.listen((config.OCNI_IP, int(config.OCNI_PORT))), self.app)
 
+        print ("\n______________________________________________________________________________________\n"
+               "Closing correctly 'locations' and 'objects' Databases: ")
+        location_registry(). close_locations_db()
+        location_registry().close_objects_db()
 
 if __name__ == '__main__':
     logger.debug('############ BEGIN OCCI Category rendering ###############')
@@ -455,7 +519,7 @@ def run_server(self):
     location_registry().register_location("/network/123", network_instance)
 
     networkinterface_instance = NetworkInterface('456', 'source', '/network/123', '192.168.1.2', '00:00:10:20:30:40',
-                                                 'active')
+        'active')
     location_registry().register_location("/link/networkinterface/456", networkinterface_instance)
 
     l = link_renderer()