cli/info: Rename instance-state as requested-state

Adapt tests accordingly

slapos/cli/info.py

@@ -105,7 +105,7 @@ def do_info(logger, conf, local):
 
     info = {
         'software-url': instance._software_release_url,
-        'instance-state': instance._requested_state,
+        'requested-state': instance._requested_state,
         'instance-parameters': instance._parameter_dict,
         'connection-parameters': connection_parameter_dict,
     }

slapos/tests/test_cli.py

@@ -682,7 +682,7 @@ class TestCliInfo(CliMixin):
     if six.PY3:
       expected = {
         "software-url": instance._software_release_url,
-        "instance-state": instance._requested_state,
+        "requested-state": instance._requested_state,
         "instance-parameters": instance._parameter_dict,
         "connection-parameters": {
           "myconnectionparameter": "value1"

slapos/tests/test_slapproxy.py

@@ -1298,7 +1298,7 @@ class TestCliInformation(CliMasterMixin):
       json.loads(output0),
       {
         "software-url": "http://sr0//",
-        "instance-state": "busy",
+        "requested-state": "busy",
         "instance-parameters": {},
         "connection-parameters": {},
         "status": "unsupported",
@@ -1309,7 +1309,7 @@ class TestCliInformation(CliMasterMixin):
       json.loads(output1),
       {
         "software-url": "http://sr1//",
-        "instance-state": "busy",
+        "requested-state": "busy",
         "instance-parameters": {"couscous": "hello"},
         "connection-parameters": {},
         "status": "unsupported",