wip: slapgrid-cp move out of slap

slapos/grid/SlapObject.py

@@ -581,7 +581,7 @@ class Partition(object):
     installs the software partition with the help of buildout
     """
     self.logger.info("Installing Computer Partition %s..."
-        % self.computer_partition.getId())
+        % self.computer_partition.get("compute_partition_id"))
 
     self.check_free_space()
 
@@ -731,7 +731,7 @@ class Partition(object):
       if os.path.exists(self.supervisord_partition_configuration_path):
         os.unlink(self.supervisord_partition_configuration_path)
     else:
-      partition_id = self.computer_partition.getId()
+      partition_id = self.computer_partition.get("compute_partition_id")
       group_partition_template = bytes2str(pkg_resources.resource_string(__name__,
           'templates/group_partition_supervisord.conf.in'))
       self.supervisor_configuration_group = group_partition_template % {
@@ -766,22 +766,22 @@ class Partition(object):
     """Asks supervisord to start the instance. If this instance is not
     installed, we install it.
     """
-    partition_id = self.computer_partition.getId()
+    partition_id = self.computer_partition.get("compute_partition_id")
     try:
       with self.getSupervisorRPC() as supervisor:
         supervisor.startProcessGroup(partition_id, False)
     except xmlrpclib.Fault as exc:
       if exc.faultString.startswith('BAD_NAME:'):
         self.logger.info("Nothing to start on %s..." %
-                         self.computer_partition.getId())
+                         self.computer_partition.get("compute_partition_id"))
       else:
         raise
     else:
-      self.logger.info("Requested start of %s..." % self.computer_partition.getId())
+      self.logger.info("Requested start of %s..." % self.computer_partition.get("compute_partition_id"))
 
   def stop(self):
     """Asks supervisord to stop the instance."""
-    partition_id = self.computer_partition.getId()
+    partition_id = self.computer_partition.get("compute_partition_id")
     try:
       with self.getSupervisorRPC() as supervisor:
         supervisor.stopProcessGroup(partition_id, False)
@@ -791,13 +791,13 @@ class Partition(object):
       else:
         raise
     else:
-      self.logger.info("Requested stop of %s..." % self.computer_partition.getId())
+      self.logger.info("Requested stop of %s..." % self.computer_partition.get("compute_partition_id"))
 
   def destroy(self):
     """Destroys the partition and makes it available for subsequent use."
     """
     self.logger.info("Destroying Computer Partition %s..."
-        % self.computer_partition.getId())
+        % self.computer_partition.get("compute_partition_id"))
 
     self.createRetentionLockDate()
     if not self.checkRetentionIsAuthorized():