From 94e2549c95eeaf906a24aec50f7f932c0a648932 Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly Date: Thu, 2 Nov 2023 17:37:55 +0000 Subject: [PATCH 1/4] CORE-15813: Add VirtualNodeUpdateRequest/VirtualNodeUpdateResponse --- .../VirtualNodeAsynchronousRequest.avsc | 5 +- .../virtualnode/VirtualNodeUpdateRequest.avsc | 46 +++++++++ .../VirtualNodeUpdateResponse.avsc | 98 +++++++++++++++++++ 3 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateRequest.avsc create mode 100644 data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc index 5e4a2603dd..c3f8dc8dcc 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc @@ -21,8 +21,9 @@ "name": "request", "doc": "The operation specific request.", "type": [ - "net.corda.data.virtualnode.VirtualNodeUpgradeRequest", - "net.corda.data.virtualnode.VirtualNodeCreateRequest" + "net.corda.data.virtualnode.VirtualNodeCreateRequest", + "net.corda.data.virtualnode.VirtualNodeUpdateRequest", + "net.corda.data.virtualnode.VirtualNodeUpgradeRequest" ] } ] diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateRequest.avsc new file mode 100644 index 0000000000..250a2bdac8 --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateRequest.avsc @@ -0,0 +1,46 @@ +{ + "type": "record", + "name": "VirtualNodeUpdateRequest", + "namespace": "net.corda.data.virtualnode", + "fields": [ + { + "name": "holdingId", + "type": "net.corda.data.identity.HoldingIdentity" + }, + { + "name": "vaultDdlConnection", + "type": ["null", "string"], + "doc": "Connection details for virtual node Vault DB to be used for DDL operations. If null is passed for both vault connections, cluster DB will be used." + }, + { + "name": "vaultDmlConnection", + "type": ["null", "string"], + "doc": "Connection details for virtual node Vault DB to be used for DML operations. If null is passed for both vault connections, cluster DB will be used." + }, + { + "name": "cryptoDdlConnection", + "type": ["null", "string"], + "doc": "Connection details for virtual node Crypto DB to be used for DDL operations. If null is passed for both crypto connections, cluster DB will be used." + }, + { + "name": "cryptoDmlConnection", + "type": ["null", "string"], + "doc": "Connection details for virtual node Crypto DB to be used for DML operations. If null is passed for both crypto connections, cluster DB will be used." + }, + { + "name": "uniquenessDdlConnection", + "type": ["null", "string"], + "doc": "Connection details for virtual node Uniqueness DB to be used for DDL operations. If null is passed for both uniqueness connections, cluster DB will be used." + }, + { + "name": "uniquenessDmlConnection", + "type": ["null", "string"], + "doc": "Connection details for virtual node Uniqueness DB to be used for DML operations. If null is passed for both uniqueness connections, cluster DB will be used." + }, + { + "name": "updateActor", + "type": "string", + "doc": "ID of RPC user that requested the virtual node creation." + } + ] +} diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc new file mode 100644 index 0000000000..69c72cc960 --- /dev/null +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc @@ -0,0 +1,98 @@ +{ + "type": "record", + "name": "VirtualNodeUpdateResponse", + "namespace": "net.corda.data.virtualnode", + "fields": [ + { + "name": "holdingIdentity", + "type": [ + "null", + "net.corda.data.identity.HoldingIdentity" + ] + }, + { + "name": "holdingIdentifierHash", + "type": [ + "null", + "string" + ], + "doc": "The short 12-character hash of the holding identity." + }, + { + "name": "vaultDdlConnectionId", + "type": [ + "null", + "string" + ], + "doc": "ID of virtual node Vault DB connection for DDL operations. Null value means that DB is managed externally." + }, + { + "name": "vaultDmlConnectionId", + "type": [ + "null", + "string" + ], + "doc": "ID of virtual node Vault DB connection for DML operations." + }, + { + "name": "cryptoDdlConnectionId", + "type": [ + "null", + "string" + ], + "doc": "ID of virtual node Crypto DB connection for DDL operations. Null value means that DB is managed externally." + }, + { + "name": "cryptoDmlConnectionId", + "type": [ + "null", + "string" + ], + "doc": "ID of virtual node Crypto DB connection for DML operations." + }, + { + "name": "uniquenessDdlConnectionId", + "type": [ + "null", + "string" + ], + "doc": "ID of virtual node Uniqueness DB connection for DDL operations. Null value means that DB is managed externally." + }, + { + "name": "uniquenessDmlConnectionId", + "type": [ + "null", + "string" + ], + "doc": "ID of virtual node Uniqueness DB connection for DML operations." + }, + { + "name": "hsmConnectionId", + "type": [ + "null", + "string" + ], + "doc": "ID of HSM connection. Null value means that HSM is not used." + }, + { + "name": "flowP2pOperationalStatus", + "type": "VirtualNodeOperationalState", + "doc": "The current flow p2p operational status of virtual node" + }, + { + "name": "flowStartOperationalStatus", + "type": "VirtualNodeOperationalState", + "doc": "The current flow start operational status of virtual node" + }, + { + "name": "flowOperationalStatus", + "type": "VirtualNodeOperationalState", + "doc": "The current flow operational status of virtual node" + }, + { + "name": "vaultDbOperationalStatus", + "type": "VirtualNodeOperationalState", + "doc": "The current vault db operational status of virtual node" + } + ] +} From 89216380f7345c10d286c1686e2999bb21fedeb4 Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly Date: Thu, 30 Nov 2023 15:18:24 +0000 Subject: [PATCH 2/4] Rename VirtualNodeUpdateRequest to VirtualNodeDbConnectionUpdateRequest Co-authored-by: Viktor Kolomeyko --- .../corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc index c3f8dc8dcc..6d6fd71d7e 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc @@ -22,7 +22,7 @@ "doc": "The operation specific request.", "type": [ "net.corda.data.virtualnode.VirtualNodeCreateRequest", - "net.corda.data.virtualnode.VirtualNodeUpdateRequest", + "net.corda.data.virtualnode.VirtualNodeDbConnectionUpdateRequest", "net.corda.data.virtualnode.VirtualNodeUpgradeRequest" ] } From c9207d2cb79ff126b5f84d519b4e5fbfefd4322d Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly Date: Thu, 30 Nov 2023 15:18:35 +0000 Subject: [PATCH 3/4] Rename VirtualNodeUpdateRequest to VirtualNodeDbConnectionUpdateRequest Co-authored-by: Viktor Kolomeyko --- .../net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc index 69c72cc960..de5df60026 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc @@ -1,6 +1,6 @@ { "type": "record", - "name": "VirtualNodeUpdateResponse", + "name": "VirtualNodeDbConnectionUpdateResponse", "namespace": "net.corda.data.virtualnode", "fields": [ { From b22651e22b0bc5b215510f560bb7b8806b49096b Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly Date: Thu, 30 Nov 2023 15:46:30 +0000 Subject: [PATCH 4/4] Rename files to incude "DbConnectionUpdate" --- ...teRequest.avsc => VirtualNodeDbConnectionUpdateRequest.avsc} | 2 +- ...Response.avsc => VirtualNodeDbConnectionUpdateResponse.avsc} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/{VirtualNodeUpdateRequest.avsc => VirtualNodeDbConnectionUpdateRequest.avsc} (97%) rename data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/{VirtualNodeUpdateResponse.avsc => VirtualNodeDbConnectionUpdateResponse.avsc} (100%) diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateRequest.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateRequest.avsc similarity index 97% rename from data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateRequest.avsc rename to data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateRequest.avsc index 250a2bdac8..ff1a305dfc 100644 --- a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateRequest.avsc +++ b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateRequest.avsc @@ -1,6 +1,6 @@ { "type": "record", - "name": "VirtualNodeUpdateRequest", + "name": "VirtualNodeDbConnectionUpdateRequest", "namespace": "net.corda.data.virtualnode", "fields": [ { diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateResponse.avsc similarity index 100% rename from data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeUpdateResponse.avsc rename to data/avro-schema/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateResponse.avsc