fix #8

Signed-off-by: John 9e9 <[email protected]>

Author: jn9e9

generator/generator.py

@@ -20,6 +20,12 @@
     gen as list_opcodes_directauth,
 )
 from generators.list_providers import gen as list_providers  # noqa: F401
+from generators.list_clients import gen as list_clients  # noqa: F401
+from generators.list_clients_admin_err import gen as list_clients_admin_err  # noqa: F401
+from generators.delete_client import gen as delete_client  # noqa: F401
+from generators.list_authenticators import gen as list_authenticators  # noqa: F401
+from generators.delete_client_admin_err import gen as delete_client_admin_err # noqa: F401
+from generators.delete_client_notexist import gen as delete_client_notexist # noqa: F401
 
 
 class TestSpec(object):
@@ -96,6 +102,8 @@ def generate_spec_data(output_folder, spec, name):
         "test_data": {
             "request": base64.b64encode(request_buf).decode("ascii"),
             "response": base64.b64encode(response_buf).decode("ascii"),
+            "request_hex": "".join('{:02x}'.format(x) for x in request_buf),
+            "response_hex": "".join('{:02x}'.format(x) for x in response_buf),
         },
     }
     out_path = os.path.join(output_folder, name + ".test.yaml")

generator/generators/delete_client.py

@@ -0,0 +1,10 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+from .protobuf import delete_client_pb2
+
+
+def gen():
+    operation = delete_client_pb2.Operation()
+    operation.client = "existing client"
+    result = delete_client_pb2.Result()
+    return (operation.SerializeToString(), result.SerializeToString())

generator/generators/delete_client_admin_err.py

@@ -0,0 +1,10 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+from .protobuf import delete_client_pb2
+
+
+def gen():
+    operation = delete_client_pb2.Operation()
+    operation.client = "client exists"
+    result = delete_client_pb2.Result()
+    return (operation.SerializeToString(), result.SerializeToString())

generator/generators/delete_client_notexist.py

@@ -0,0 +1,10 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+from .protobuf import delete_client_pb2
+
+
+def gen():
+    operation = delete_client_pb2.Operation()
+    operation.client = "not exist"
+    result = delete_client_pb2.Result()
+    return (operation.SerializeToString(), result.SerializeToString())

generator/generators/list_authenticators.py

@@ -0,0 +1,16 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+from .protobuf import list_authenticators_pb2
+
+
+def gen():
+    operation = list_authenticators_pb2.Operation()
+
+    result = list_authenticators_pb2.Result()
+    auth_info = list_authenticators_pb2.AuthenticatorInfo()
+    auth_info.description = "direct auth"
+    auth_info.version_maj = 12
+    auth_info.version_min = 42
+    auth_info.id = 1
+    result.authenticators.extend([auth_info])
+    return (operation.SerializeToString(), result.SerializeToString())

generator/generators/list_clients.py

@@ -0,0 +1,11 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+from .protobuf import list_clients_pb2
+
+
+def gen():
+    operation = list_clients_pb2.Operation()
+
+    result = list_clients_pb2.Result()
+    result.clients.extend(["jim", "bob"])
+    return (operation.SerializeToString(), result.SerializeToString())

generator/generators/list_clients_admin_err.py

@@ -0,0 +1,10 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+from .protobuf import list_clients_pb2
+
+
+def gen():
+    operation = list_clients_pb2.Operation()
+
+    result = list_clients_pb2.Result()
+    return (operation.SerializeToString(), result.SerializeToString())

generator/test_specs/delete_client.spec.yaml

@@ -0,0 +1,41 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+spec:
+  description: Delete client with direct authenticator
+  request:
+    header:
+      magic_number: 0x5EC0A710
+      header_size: 0x1E
+      major_version_number: 0x01
+      minor_version_number: 0x00
+      flags: 0x0000
+      provider: 0x02
+      session_handle: 0x0000000000000000
+      content_type: 0x00
+      accept_type: 0x00
+      auth_type: 0x01
+      content_length: auto
+      auth_length: auto
+      opcode: 0x0000001C
+      status: 0x0000
+    body_description: single client called "existing client"
+    auth: 
+      type: direct
+      app_name: admin_priv
+  response:
+    header:
+      magic_number: 0x5EC0A710
+      header_size: 0x1E
+      major_version_number: 0x01
+      minor_version_number: 0x00
+      flags: 0x0000
+      provider: 0x00
+      session_handle: 0x0000000000000000
+      content_type: 0x00
+      accept_type: 0x00
+      auth_type: 0x00
+      content_length: auto
+      auth_length: 0x0000
+      opcode: 0x0000001C
+      status: 0x0000
+    body_description: no body

generator/test_specs/delete_client_admin_err.spec.yaml

@@ -0,0 +1,41 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+spec:
+  description: Delete client without admin privilege
+  request:
+    header:
+      magic_number: 0x5EC0A710
+      header_size: 0x1E
+      major_version_number: 0x01
+      minor_version_number: 0x00
+      flags: 0x0000
+      provider: 0x02
+      session_handle: 0x0000000000000000
+      content_type: 0x00
+      accept_type: 0x00
+      auth_type: 0x01
+      content_length: auto
+      auth_length: auto
+      opcode: 0x0000001C
+      status: 0x0000
+    body_description: client called 'client exists'
+    auth: 
+      type: direct
+      app_name: no_admin
+  response:
+    header:
+      magic_number: 0x5EC0A710
+      header_size: 0x1E
+      major_version_number: 0x01
+      minor_version_number: 0x00
+      flags: 0x0000
+      provider: 0x00
+      session_handle: 0x0000000000000000
+      content_type: 0x00
+      accept_type: 0x00
+      auth_type: 0x00
+      content_length: auto
+      auth_length: 0x0000
+      opcode: 0x0000001C
+      status: 0x0015
+    body_description: empty response with AdminOperation status code

generator/test_specs/delete_client_notexist.spec.yaml

@@ -0,0 +1,41 @@
+# Copyright 2021 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+spec:
+  description: Delete client that doesn't exist
+  request:
+    header:
+      magic_number: 0x5EC0A710
+      header_size: 0x1E
+      major_version_number: 0x01
+      minor_version_number: 0x00
+      flags: 0x0000
+      provider: 0x02
+      session_handle: 0x0000000000000000
+      content_type: 0x00
+      accept_type: 0x00
+      auth_type: 0x01
+      content_length: auto
+      auth_length: auto
+      opcode: 0x0000001C
+      status: 0x0000
+    body_description: single client named 'not exist'
+    auth: 
+      type: direct
+      app_name: admin_priv
+  response:
+    header:
+      magic_number: 0x5EC0A710
+      header_size: 0x1E
+      major_version_number: 0x01
+      minor_version_number: 0x00
+      flags: 0x0000
+      provider: 0x00
+      session_handle: 0x0000000000000000
+      content_type: 0x00
+      accept_type: 0x00
+      auth_type: 0x00
+      content_length: auto
+      auth_length: 0x0000
+      opcode: 0x0000001C
+      status: 1140 # PsaErrorNotExist
+    body_description: empty response PsaErrorNotExist error code