slapformat: fix missing portal type and missing option

slapos/format.py

@@ -381,7 +381,8 @@ class Computer(object):
         return
       slap_instance.jio_api_connector.put({
         "compute_node_id": self.reference,
-        "compute_partition_list": partition_list
+        "compute_partition_list": partition_list,
+        "portal_type": "Compute Node",
       })
     else:
       slap_computer = slap_instance.registerComputer(self.reference)
@@ -1713,6 +1714,7 @@ class FormatConfig(object):
   dry_run = None                # modifiable by cmdline
   key_file = None
   cert_file = None
+  slapgrid_jio_uri = None
 
   def __init__(self, logger):
     self.logger = logger

slapos/tests/test_slapformat.py

@@ -745,6 +745,7 @@ class TestFormatSendToMaster(SlapformatMixin):
       self.body_sequence,
       [
         {
+          'portal_type': 'Compute Node',
           'compute_node_id': 'computer',
           'compute_partition_list': [
             {