slapos: Make test_object pass

slapos/tests/test_object.py

@@ -135,7 +135,6 @@ class MasterMixin(BasicMixin, unittest.TestCase):
       self,
       software_release_url,
       partition_id=None,
-      slap_computer_partition=None,
       retention_delay=None,
       partition_timeout=None,
       shared_part_list='',
@@ -153,10 +152,18 @@ class MasterMixin(BasicMixin, unittest.TestCase):
     if partition_id is None:
       partition_id = 'mypartition'
 
-    if slap_computer_partition is None:
-      slap_computer_partition = SlapComputerPartition(
-        computer_id='bidon',
-        partition_id=partition_id)
+    software_instance = {
+      "reference": partition_id,
+      "compute_node_id": 'bidon',
+      "portal_type": "Software Instance",
+      "compute_partition_id": partition_id,
+      "state": "stopped",
+      "software_type": None,
+      "parameters": {},
+      "processing_timestamp": 0,
+      "ip_list": [],
+      "full_ip_list": [],
+    }
 
     instance_path = os.path.join(self.instance_root, partition_id)
     os.mkdir(instance_path)
@@ -173,7 +180,7 @@ class MasterMixin(BasicMixin, unittest.TestCase):
       supervisord_partition_configuration_dir=supervisor_configuration_path,
       supervisord_socket=os.path.join(
           supervisor_configuration_path, 'supervisor.sock'),
-      computer_partition=slap_computer_partition,
+      computer_partition=software_instance,
       computer_id='bidon',
       partition_id=partition_id,
       server_url='bidon',