diff --git a/docs/docs/weaver/getting-started/test-network/setup-local.md b/docs/docs/weaver/getting-started/test-network/setup-local.md index 1ad9701ca2..594b1c6511 100644 --- a/docs/docs/weaver/getting-started/test-network/setup-local.md +++ b/docs/docs/weaver/getting-started/test-network/setup-local.md @@ -804,7 +804,7 @@ Run a Corda driver as follows: ``` - Run the following to start Corda driver for `Corda_Network2`: ```bash - DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver + DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda ``` If the driver starts successfully, it should log the following message on your terminal: ``` diff --git a/docs/docs/weaver/getting-started/test-network/setup-packages.md b/docs/docs/weaver/getting-started/test-network/setup-packages.md index 38bdf5307f..6b166086fc 100644 --- a/docs/docs/weaver/getting-started/test-network/setup-packages.md +++ b/docs/docs/weaver/getting-started/test-network/setup-packages.md @@ -694,7 +694,7 @@ Run a Corda driver as follows: - Navigate to the `weaver/core/drivers/corda-driver` folder. - Run the following to start Corda driver for `Corda_Network`: ```bash - ./build/install/corda-driver/bin/corda-driver + ./build/install/driver-corda/bin/driver-corda ``` If the driver starts successfully, it should log the following message on your terminal: ``` @@ -702,7 +702,7 @@ Run a Corda driver as follows: ``` - Run the following to start Corda driver for `Corda_Network2`: ```bash - DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver + DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda ``` If the driver starts successfully, it should log the following message on your terminal: ``` diff --git a/weaver/common/protos-go/networks/networks.pb.go b/weaver/common/protos-go/networks/networks.pb.go index 0f6e712fd5..a98c20fccd 100644 --- a/weaver/common/protos-go/networks/networks.pb.go +++ b/weaver/common/protos-go/networks/networks.pb.go @@ -401,15 +401,16 @@ type NetworkAssetTransfer struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Policy []string `protobuf:"bytes,1,rep,name=policy,proto3" json:"policy,omitempty"` - Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` - RequestingRelay string `protobuf:"bytes,3,opt,name=requesting_relay,json=requestingRelay,proto3" json:"requesting_relay,omitempty"` - RequestingNetwork string `protobuf:"bytes,4,opt,name=requesting_network,json=requestingNetwork,proto3" json:"requesting_network,omitempty"` - Certificate string `protobuf:"bytes,5,opt,name=certificate,proto3" json:"certificate,omitempty"` - RequestorSignature string `protobuf:"bytes,6,opt,name=requestor_signature,json=requestorSignature,proto3" json:"requestor_signature,omitempty"` - Nonce string `protobuf:"bytes,7,opt,name=nonce,proto3" json:"nonce,omitempty"` - RequestingOrg string `protobuf:"bytes,8,opt,name=requesting_org,json=requestingOrg,proto3" json:"requesting_org,omitempty"` - Confidential bool `protobuf:"varint,9,opt,name=confidential,proto3" json:"confidential,omitempty"` + AssetType string `protobuf:"bytes,1,opt,name=asset_type,json=assetType,proto3" json:"asset_type,omitempty"` + AssetId string `protobuf:"bytes,2,opt,name=asset_id,json=assetId,proto3" json:"asset_id,omitempty"` + Sender string `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` + SourceContractId string `protobuf:"bytes,4,opt,name=source_contract_id,json=sourceContractId,proto3" json:"source_contract_id,omitempty"` + SourceRelay string `protobuf:"bytes,5,opt,name=source_relay,json=sourceRelay,proto3" json:"source_relay,omitempty"` + SourceNetwork string `protobuf:"bytes,6,opt,name=source_network,json=sourceNetwork,proto3" json:"source_network,omitempty"` + DestinationRelay string `protobuf:"bytes,7,opt,name=destination_relay,json=destinationRelay,proto3" json:"destination_relay,omitempty"` + DestinationNetwork string `protobuf:"bytes,8,opt,name=destination_network,json=destinationNetwork,proto3" json:"destination_network,omitempty"` + Recipient string `protobuf:"bytes,9,opt,name=recipient,proto3" json:"recipient,omitempty"` + DestinationContractId string `protobuf:"bytes,10,opt,name=destination_contract_id,json=destinationContractId,proto3" json:"destination_contract_id,omitempty"` } func (x *NetworkAssetTransfer) Reset() { @@ -444,67 +445,74 @@ func (*NetworkAssetTransfer) Descriptor() ([]byte, []int) { return file_networks_networks_proto_rawDescGZIP(), []int{6} } -func (x *NetworkAssetTransfer) GetPolicy() []string { +func (x *NetworkAssetTransfer) GetAssetType() string { if x != nil { - return x.Policy + return x.AssetType } - return nil + return "" } -func (x *NetworkAssetTransfer) GetAddress() string { +func (x *NetworkAssetTransfer) GetAssetId() string { if x != nil { - return x.Address + return x.AssetId } return "" } -func (x *NetworkAssetTransfer) GetRequestingRelay() string { +func (x *NetworkAssetTransfer) GetSender() string { if x != nil { - return x.RequestingRelay + return x.Sender } return "" } -func (x *NetworkAssetTransfer) GetRequestingNetwork() string { +func (x *NetworkAssetTransfer) GetSourceContractId() string { if x != nil { - return x.RequestingNetwork + return x.SourceContractId } return "" } -func (x *NetworkAssetTransfer) GetCertificate() string { +func (x *NetworkAssetTransfer) GetSourceRelay() string { if x != nil { - return x.Certificate + return x.SourceRelay } return "" } -func (x *NetworkAssetTransfer) GetRequestorSignature() string { +func (x *NetworkAssetTransfer) GetSourceNetwork() string { if x != nil { - return x.RequestorSignature + return x.SourceNetwork } return "" } -func (x *NetworkAssetTransfer) GetNonce() string { +func (x *NetworkAssetTransfer) GetDestinationRelay() string { if x != nil { - return x.Nonce + return x.DestinationRelay } return "" } -func (x *NetworkAssetTransfer) GetRequestingOrg() string { +func (x *NetworkAssetTransfer) GetDestinationNetwork() string { if x != nil { - return x.RequestingOrg + return x.DestinationNetwork } return "" } -func (x *NetworkAssetTransfer) GetConfidential() bool { +func (x *NetworkAssetTransfer) GetRecipient() string { if x != nil { - return x.Confidential + return x.Recipient } - return false + return "" +} + +func (x *NetworkAssetTransfer) GetDestinationContractId() string { + if x != nil { + return x.DestinationContractId + } + return "" } var File_networks_networks_proto protoreflect.FileDescriptor @@ -574,79 +582,83 @@ var file_networks_networks_proto_rawDesc = []byte{ 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0xd6, 0x02, 0x0a, 0x14, 0x4e, 0x65, + 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0x94, 0x03, 0x0a, 0x14, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, - 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x06, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x69, - 0x6e, 0x67, 0x5f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, - 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x12, - 0x2d, 0x0a, 0x12, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x72, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x20, - 0x0a, 0x0b, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, - 0x12, 0x2f, 0x0a, 0x13, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x69, - 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x72, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x6f, 0x72, 0x67, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x4f, 0x72, 0x67, 0x12, 0x22, - 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x18, 0x09, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, - 0x61, 0x6c, 0x32, 0xa7, 0x05, 0x0a, 0x07, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x42, - 0x0a, 0x0c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1f, - 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x73, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, - 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, - 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, - 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x1a, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x00, - 0x12, 0x50, 0x0a, 0x0f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x44, 0x61, 0x74, 0x61, 0x62, - 0x61, 0x73, 0x65, 0x12, 0x19, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x44, 0x62, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x20, - 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, - 0x6b, 0x73, 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x52, 0x0a, 0x14, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, - 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x12, 0x27, 0x2e, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x4e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, - 0x66, 0x65, 0x72, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, - 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, - 0x69, 0x62, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2b, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x65, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x73, 0x73, 0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x73, 0x73, 0x65, 0x74, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x73, 0x73, 0x65, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x73, 0x73, 0x65, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, + 0x6e, 0x64, 0x65, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x10, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, + 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x72, 0x65, 0x6c, + 0x61, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x52, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, + 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, + 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x2b, 0x0a, 0x11, + 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x6c, 0x61, + 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x12, 0x2f, 0x0a, 0x13, 0x64, 0x65, 0x73, + 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x64, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, + 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, + 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x36, 0x0a, 0x17, 0x64, 0x65, 0x73, 0x74, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, + 0x5f, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x64, 0x65, 0x73, 0x74, 0x69, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x49, 0x64, + 0x32, 0xa7, 0x05, 0x0a, 0x07, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x42, 0x0a, 0x0c, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1f, 0x2e, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, + 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x0f, 0x2e, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, + 0x12, 0x4c, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x2e, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, + 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, + 0x1a, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x00, 0x12, 0x50, + 0x0a, 0x0f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, + 0x65, 0x12, 0x19, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x44, 0x62, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x20, 0x2e, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, + 0x2e, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x52, 0x0a, 0x14, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x41, 0x73, 0x73, 0x65, 0x74, + 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x12, 0x27, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x4e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, - 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x12, 0x68, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x22, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, - 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, - 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x25, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x6f, 0x6e, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, - 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x22, 0x00, 0x12, 0x54, 0x0a, 0x10, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, - 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2d, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x73, 0x73, 0x65, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, + 0x72, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, + 0x63, 0x6b, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x0e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, + 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2b, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, - 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x47, - 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x1a, - 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x00, 0x42, 0x79, 0x0a, 0x35, - 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, - 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, - 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x6e, - 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, + 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x12, 0x68, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x22, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, + 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x25, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x53, 0x75, 0x62, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x00, + 0x12, 0x54, 0x0a, 0x10, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x45, + 0x76, 0x65, 0x6e, 0x74, 0x12, 0x2d, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, + 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, + 0x45, 0x76, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, + 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x12, 0x22, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x47, 0x65, 0x74, + 0x53, 0x74, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x1a, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x00, 0x42, 0x79, 0x0a, 0x35, 0x6f, 0x72, + 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, + 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x73, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, + 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x6e, 0x65, 0x74, + 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-rs/pkg/src/generated/networks.networks.rs b/weaver/common/protos-rs/pkg/src/generated/networks.networks.rs index 789768180a..387879e3f6 100644 --- a/weaver/common/protos-rs/pkg/src/generated/networks.networks.rs +++ b/weaver/common/protos-rs/pkg/src/generated/networks.networks.rs @@ -75,24 +75,26 @@ pub struct NetworkEventUnsubscription { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct NetworkAssetTransfer { - #[prost(string, repeated, tag = "1")] - pub policy: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + #[prost(string, tag = "1")] + pub asset_type: ::prost::alloc::string::String, #[prost(string, tag = "2")] - pub address: ::prost::alloc::string::String, + pub asset_id: ::prost::alloc::string::String, #[prost(string, tag = "3")] - pub requesting_relay: ::prost::alloc::string::String, + pub sender: ::prost::alloc::string::String, #[prost(string, tag = "4")] - pub requesting_network: ::prost::alloc::string::String, + pub source_contract_id: ::prost::alloc::string::String, #[prost(string, tag = "5")] - pub certificate: ::prost::alloc::string::String, + pub source_relay: ::prost::alloc::string::String, #[prost(string, tag = "6")] - pub requestor_signature: ::prost::alloc::string::String, + pub source_network: ::prost::alloc::string::String, #[prost(string, tag = "7")] - pub nonce: ::prost::alloc::string::String, + pub destination_relay: ::prost::alloc::string::String, #[prost(string, tag = "8")] - pub requesting_org: ::prost::alloc::string::String, - #[prost(bool, tag = "9")] - pub confidential: bool, + pub destination_network: ::prost::alloc::string::String, + #[prost(string, tag = "9")] + pub recipient: ::prost::alloc::string::String, + #[prost(string, tag = "10")] + pub destination_contract_id: ::prost::alloc::string::String, } /// Generated client implementations. pub mod network_client { diff --git a/weaver/common/protos/networks/networks.proto b/weaver/common/protos/networks/networks.proto index 2784f14e1f..8a586d0252 100644 --- a/weaver/common/protos/networks/networks.proto +++ b/weaver/common/protos/networks/networks.proto @@ -77,13 +77,14 @@ message NetworkEventUnsubscription { } message NetworkAssetTransfer { - repeated string policy = 1; - string address = 2; - string requesting_relay = 3; - string requesting_network = 4; - string certificate = 5; - string requestor_signature = 6; - string nonce = 7; - string requesting_org = 8; - bool confidential = 9; -} \ No newline at end of file + string asset_type = 1; + string asset_id = 2; + string sender = 3; + string source_contract_id = 4; + string source_relay = 5; + string source_network = 6; + string destination_relay = 7; + string destination_network = 8; + string recipient = 9; + string destination_contract_id = 10; +} diff --git a/weaver/core/drivers/fabric-driver/.gitignore b/weaver/core/drivers/fabric-driver/.gitignore index 397a379c7b..3c8dcef17e 100644 --- a/weaver/core/drivers/fabric-driver/.gitignore +++ b/weaver/core/drivers/fabric-driver/.gitignore @@ -11,4 +11,5 @@ cacti-weaver-sdk-fabric wallet-network1/*.id !wallet-network1/relay.id wallet-network2/*.id -!wallet-network2/relay.id \ No newline at end of file +!wallet-network2/relay.id +satp_info.txt diff --git a/weaver/core/drivers/fabric-driver/server/sample-satp.ts b/weaver/core/drivers/fabric-driver/server/sample-satp.ts index 6d8924c000..d7e76706b5 100644 --- a/weaver/core/drivers/fabric-driver/server/sample-satp.ts +++ b/weaver/core/drivers/fabric-driver/server/sample-satp.ts @@ -1,11 +1,18 @@ +/* + * Copyright IBM Corp. All Rights Reserved. + * + * SPDX-License-Identifier: Apache-2.0 + */ + +import * as path from "path"; import satp_pb from '@hyperledger/cacti-weaver-protos-js/relay/satp_pb'; import satp_grpc_pb from '@hyperledger/cacti-weaver-protos-js/relay/satp_grpc_pb'; import driverPb from '@hyperledger/cacti-weaver-protos-js/driver/driver_pb'; import logger from './logger'; import { credentials } from '@grpc/grpc-js'; -import { SatpAssetManager, AssetManager, HashFunctions } from '@hyperledger/cacti-weaver-sdk-fabric' +import { SatpAssetManager } from '@hyperledger/cacti-weaver-sdk-fabric' import fs from 'fs'; -import { Gateway, Network } from 'fabric-network' +import { Gateway, Network, Wallets, X509Identity } from 'fabric-network' import { getNetworkGateway } from "./fabric-code"; import { getDriverKeyCert } from './walletSetup'; @@ -17,87 +24,38 @@ async function performLockHelper( // TODO: remove the hardcoded values let performLockRequest2 = {}; performLockRequest2['target-network'] = 'network1'; - performLockRequest2['hashBase64'] = 'ivHErp1x4bJDKuRo6L5bApO/DdoyD/dG0mAZrzLZEIs='; performLockRequest2['timeout-duration'] = parseInt('3600'); performLockRequest2['locker'] = 'alice'; performLockRequest2['recipient'] = 'bob'; performLockRequest2['lockerWalletPath'] = '../wallet-network1/alice.id'; - performLockRequest2['recipientWalletPath'] = '../wallet-network1/bob.id'; - performLockRequest2['param'] = 'bond01:a05'; + // HACK below; reading from temp file created by the relay SATP client; ideally, we shoudld get this info from the function parameter + performLockRequest2['param'] = fs.existsSync('satp_info.txt') ? fs.readFileSync('satp_info.txt').toString() : 'bond01:a05'; + if (performLockRequest2['param'].split(':').length === 1) { + performLockRequest2['param'] = performLockRequest2['param'] + ':a05'; + } performLockRequest2['channel'] = 'mychannel'; performLockRequest2['chaincode-id'] = 'satpsimpleasset'; - // Locker and recipient - const locker = performLockRequest2['locker']; const recipient = performLockRequest2['recipient']; - const recipientWalletPath = performLockRequest2['recipientWalletPath']; - let hashFn = performLockRequest2['hash_fn']; - let hashBase64 = performLockRequest2['hashBase64']; - const targetNetwork = performLockRequest2['target-network']; const channel = performLockRequest2['channel']; const chaincodeId = performLockRequest2['chaincode-id']; - // Hash - let hash: HashFunctions.Hash - if (hashFn == 'SHA512') { - hash = new HashFunctions.SHA512() - } else { - hash = new HashFunctions.SHA256() - } - - if (hashBase64) { - hash.setSerializedHashBase64(hashBase64) - } - else { - logger.info(`No hash provided, using random preimage`) - } - - // Timeout - let timeout = 0; - const currTime = Math.floor(Date.now() / 1000); - if (performLockRequest2['timeout-epoch']) { - timeout = performLockRequest2['timeout-epoch'] - } - else if (performLockRequest2['timeout-duration']) { - timeout = currTime + performLockRequest2['timeout-duration'] - } - let gateway: Gateway = await getNetworkGateway(networkName); const network: Network = await gateway.getNetwork(channel); const contract = network.getContract(chaincodeId); const params = performLockRequest2['param'].split(':') - const recipientCert = Buffer.from(recipientWalletPath).toString('base64') - - let funcToCall, asset try { - if (performLockRequest2['fungible']) { - funcToCall = AssetManager.createFungibleHTLC - asset = 'Fungible Asset' - } else { - funcToCall = AssetManager.createHTLC - asset = 'Asset' - } - - logger.info(`Asset Lock: Lock ${asset}:\n`); - - logger.info(`Trying ${asset} Lock: ${params[0]}, ${params[1]} by ${locker} for ${recipient}`) - const res = await funcToCall(contract, - params[0], - params[1], - recipientCert, - hash, - timeout, - null) - if (!res.result) { + logger.info(`Trying to lock asset <${params[0]}, ${params[1]}> for SATP to ${recipient}`) + const res = await SatpAssetManager.lockAsset(contract, params[0], params[1]) + if (!res) { throw new Error() } - logger.info(`${asset} Locked with Contract Id: ${res.result}, preimage: ${res.hash.getPreimage()}, hashvalue: ${res.hash.getSerializedHashBase64()}`) - logger.info('Asset has been locked successfully') + logger.info(`Asset <${params[0]}, ${params[1]}> locked successfully for gateway`) } catch (error) { - logger.error(`Could not Lock ${asset} in ${targetNetwork}`) + logger.error(`Could not lock asset <${params[0]}, ${params[1]}>`) } finally { if (gateway) { await gateway.disconnect(); @@ -119,13 +77,19 @@ async function createAssetHelper( // TODO: remove the hardcoded values let createAssetRequest2 = {}; - createAssetRequest2['target-network'] = 'network1'; - createAssetRequest2['hashBase64'] = 'ivHErp1x4bJDKuRo6L5bApO/DdoyD/dG0mAZrzLZEIs='; + createAssetRequest2['target-network'] = 'network2'; createAssetRequest2['timeout-duration'] = parseInt('3600'); createAssetRequest2['owner'] = 'admin'; createAssetRequest2['type'] = 'bond'; - createAssetRequest2['assetType'] = 'bond01'; - createAssetRequest2['id'] = 'a0demo'; + // HACK below; reading from temp file created by the relay SATP client; ideally, we shoudld get this info from the function parameter + const asset_info = fs.existsSync('satp_info.txt') ? fs.readFileSync('satp_info.txt').toString() : 'bond01:a05'; + let asset_info_parts = asset_info.split(':'); + createAssetRequest2['assetType'] = asset_info_parts[0] + '_new'; + if (asset_info_parts.length === 1) { + createAssetRequest2['id'] = 'a05_new'; + } else { + createAssetRequest2['id'] = asset_info_parts[1] + '_new'; + } createAssetRequest2['issuer'] = 'admin'; createAssetRequest2['facevalue'] = '300'; createAssetRequest2['maturitydate'] = '05 May 48 00:00 MST'; @@ -170,7 +134,7 @@ async function createAssetHelper( } logger.info(currentQuery) - logger.info(`Trying creating the asset: type: ${ccType}, id: ${id}, by: ${owner}, facevalue: ${facevalue}, maturitydate: ${maturitydate}`) + logger.info(`Trying creating the asset: type: ${assetType}, id: ${id}, by: ${owner}, facevalue: ${facevalue}, maturitydate: ${maturitydate}`) const read = await contract.submitTransaction(currentQuery.ccFunc, ...currentQuery.args) const state = Buffer.from(read).toString() if (state) { @@ -197,10 +161,43 @@ async function createAssetHelper( } async function extinguishHelper( - extinguishRequest: driverPb.ExtinguishRequest + extinguishRequest: driverPb.ExtinguishRequest, + networkName: string ) { + const channel = 'mychannel'; + const chaincodeId = 'satpsimpleasset'; + let gateway: Gateway = await getNetworkGateway(networkName); + const network: Network = await gateway.getNetwork(channel); + const contract = network.getContract(chaincodeId); + + // HACK below; reading from temp file created by the relay SATP client; ideally, we shoudld get this info from the function parameter + const asset_info = fs.existsSync('satp_info.txt') ? fs.readFileSync('satp_info.txt').toString() : 'bond01:a05'; + let asset_info_parts = asset_info.split(':'); + const assetType = asset_info_parts[0]; + let assetId; + if (asset_info_parts.length === 1) { + assetId = 'a05'; + } else { + assetId = asset_info_parts[1]; + } + + try { + logger.info(`Trying to extinguish asset <${assetType}, ${assetId}> for SATP completion`) + const res = await SatpAssetManager.extinguishAsset(contract, assetType, assetId) + if (!res) { + throw new Error() + } + logger.info(`Asset <${assetType}, ${assetId}> extinguished successfully by gateway`) + + } catch (error) { + logger.error(`Could not extinguish asset <${assetType}, ${assetId}>`) + } finally { + if (gateway) { + await gateway.disconnect(); + logger.info('Gateway disconnected.'); + } + } - // TODO: run the appropriate extinguish logic const client = getRelayClientForAssetStatusResponse(); const request = new satp_pb.SendAssetStatusRequest(); request.setSessionId(extinguishRequest.getSessionId()); @@ -215,25 +212,22 @@ async function assignAssetHelper( // TODO: remove the hardcoded values let assignAssetRequest2 = {}; - assignAssetRequest2['target-network'] = 'network1'; - assignAssetRequest2['hashBase64'] = 'ivHErp1x4bJDKuRo6L5bApO/DdoyD/dG0mAZrzLZEIs='; + assignAssetRequest2['target-network'] = 'network2'; assignAssetRequest2['timeout-duration'] = parseInt('3600'); assignAssetRequest2['locker'] = 'admin'; assignAssetRequest2['recipient'] = 'bob'; - assignAssetRequest2['fungible'] = false; - assignAssetRequest2['contract-id'] = 'abc01'; - assignAssetRequest2['hash_fn'] = ''; - assignAssetRequest2['secret'] = 'secrettext'; - assignAssetRequest2['param'] = 'bond01:a0demo'; + // HACK below; reading from temp file created by the relay SATP client; ideally, we shoudld get this info from the function parameter + const asset_info = fs.existsSync('satp_info.txt') ? fs.readFileSync('satp_info.txt').toString() : 'bond01:a05'; + let asset_info_parts = asset_info.split(':'); + if (asset_info_parts.length === 1) { + assignAssetRequest2['param'] = asset_info_parts[0] + '_new:a05_new'; + } else { + assignAssetRequest2['param'] = asset_info_parts[0] + '_new:' + asset_info_parts[1] + '_new'; + } assignAssetRequest2['channel'] = 'mychannel'; assignAssetRequest2['chaincode-id'] = 'satpsimpleasset'; - const targetNetwork = assignAssetRequest2['target-network']; - const locker = assignAssetRequest2['locker']; const recipient = assignAssetRequest2['recipient']; - const fungible = assignAssetRequest2['fungible']; - const hashFn = assignAssetRequest2['hash_fn']; - const secret = assignAssetRequest2['secret']; const channel = assignAssetRequest2['channel']; const chaincodeId = assignAssetRequest2['chaincode-id']; @@ -241,76 +235,41 @@ async function assignAssetHelper( const network: Network = await gateway.getNetwork(channel); const contract = network.getContract(chaincodeId); - // Hash - let hash: HashFunctions.Hash - if (hashFn === 'SHA512') { - hash = new HashFunctions.SHA512() - } else { - hash = new HashFunctions.SHA256() - } - hash.setPreimage(secret) - - let contractId: string = null - if (assignAssetRequest2['contract-id']) { - contractId = assignAssetRequest2['contract-id'] - } - - const params = assignAssetRequest2['param'].split(':') - - let funcToCall = SatpAssetManager.assignAsset - let asset = assignAssetRequest2['param'] - - if (assignAssetRequest2['fungible']) { - // funcToCall = SatpAssetManager.claimFungibleAssetInHTLC - asset = 'Fungible Asset' - } + const params = assignAssetRequest2['param'].split(':'); + // TODO: read the recipient's ID and certificate from service parameters + // instead of reading a manually copied wallet ID from the local filesystem + const walletPath = process.env.WALLET_PATH + ? process.env.WALLET_PATH + : path.join( + process.cwd(), + `wallet-${process.env.NETWORK_NAME ? process.env.NETWORK_NAME : "network1"}`, + ); + const wallet = await Wallets.newFileSystemWallet(walletPath) + const recipientId = await wallet.get(recipient) + const recipientCert = Buffer.from((recipientId as X509Identity).credentials.certificate).toString('base64') - if (fungible) { - try { - logger.info(`Trying assigning the asset with contract id ${contractId}`) - - // TODO - } catch (error) { - logger.error(`Could not assign ${asset} in ${targetNetwork}`) - throw new Error(`Could not assign ${asset} in ${targetNetwork}`) - } finally { - if (gateway) { - await gateway.disconnect(); - logger.info('Gateway disconnected.'); - } - } - } else { - try { - const driverkeyCert = await getDriverKeyCert(); - const certificate = Buffer.from(driverkeyCert.cert).toString('base64') - - logger.info(`Trying assign asset with params: ${params[0]}, ${params[1]} locked by ${locker} for ${recipient}`) - const res = await funcToCall(contract, - params[0], - params[1], - certificate, - hash) - if (!res) { - throw new Error() - } - logger.info(`${asset} assigned complete: ${res}`) - logger.info(`Asset ${asset} assign complete: ${res}`) - } catch (error) { - logger.error(`Could not assign non-fungible ${asset} in ${targetNetwork}: ${error}`) - throw new Error(`Could not assign non-fungible ${asset} in ${targetNetwork}: ${error}`) - } finally { - if (gateway) { - await gateway.disconnect(); - logger.info('Gateway disconnected.'); - } + try { + logger.info(`Trying to assign asset <${params[0]}, ${params[1]}> from SATP to ${recipient}`) + const res = await SatpAssetManager.assignAsset(contract, params[0], params[1], recipientCert) + if (!res) { + throw new Error() } + logger.info(`Asset <${params[0]}, ${params[1]}> assigned successfully successfully by gateway to ${recipient}`) - const client = getRelayClientForAssetStatusResponse(); - const request = new satp_pb.SendAssetStatusRequest(); - request.setSessionId(assignAssetRequest.getSessionId()); - request.setStatus("Finalized"); - client.sendAssetStatus(request, relayCallback); + } catch (error) { + logger.error(`Could not assign asset <${params[0]}, ${params[1]}> to ${recipient}`) + } finally { + if (gateway) { + await gateway.disconnect(); + logger.info('Gateway disconnected.'); + } } + + const client = getRelayClientForAssetStatusResponse(); + const request = new satp_pb.SendAssetStatusRequest(); + request.setSessionId(assignAssetRequest.getSessionId()); + request.setStatus("Finalized"); + client.sendAssetStatus(request, relayCallback); } function getRelayClientForAssetStatusResponse() { diff --git a/weaver/core/drivers/fabric-driver/server/server.ts b/weaver/core/drivers/fabric-driver/server/server.ts index 31c0bfd2dc..c6d4c08ba4 100644 --- a/weaver/core/drivers/fabric-driver/server/server.ts +++ b/weaver/core/drivers/fabric-driver/server/server.ts @@ -319,7 +319,7 @@ server.addService(driver_pb_grpc.DriverCommunicationService, { extinguish: (call: { request: driverPb.ExtinguishRequest }, callback: (_: any, object: ack_pb.Ack) => void) => { const requestId: string = call.request.getSessionId(); - extinguishHelper(call.request).then(() => { + extinguishHelper(call.request, process.env.NETWORK_NAME ? process.env.NETWORK_NAME : 'network1').then(() => { const ack_response = new ack_pb.Ack(); ack_response.setRequestId(requestId); ack_response.setMessage('Successfully extinguished the asset'); @@ -429,7 +429,6 @@ if (process.env.DRIVER_TLS === "true") { (cb) => { configSetup().then(() => { logger.info("Starting server with TLS"); - server.start(); monitorService(); }); }, @@ -441,7 +440,6 @@ if (process.env.DRIVER_TLS === "true") { (cb) => { configSetup().then(() => { logger.info("Starting server without TLS"); - server.start(); monitorService(); }); }, diff --git a/weaver/core/identity-management/iin-agent/dnsconfig.json.template b/weaver/core/identity-management/iin-agent/dnsconfig.json.template index ebc86bbc14..363258846c 100644 --- a/weaver/core/identity-management/iin-agent/dnsconfig.json.template +++ b/weaver/core/identity-management/iin-agent/dnsconfig.json.template @@ -2,13 +2,13 @@ "": { "": { "endpoint": "", - "tls": , + "tls": "true"/"false", "tlsCACertPath": "" }, "": { "endpoint": "", - "tls": , + "tls": "true"/"false", "tlsCACertPath": "" } } -} \ No newline at end of file +} diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-2-nodes.json b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-2-nodes.json index 9481d0e902..f88c0132d4 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-2-nodes.json +++ b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-2-nodes.json @@ -2,24 +2,24 @@ "network1": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network1:9500", - "tls": false, + "tls": "false", "tlsCACertPath": "" }, "Org2MSP": { "endpoint": "iin-agent-Org2MSP-network1:9510", - "tls": false, + "tls": "false", "tlsCACertPath": "" } }, "network2": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network2:9501", - "tls": false, + "tls": "false", "tlsCACertPath": "" }, "Org2MSP": { "endpoint": "iin-agent-Org2MSP-network2:9511", - "tls": false, + "tls": "false", "tlsCACertPath": "" } } diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls-2-nodes.json b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls-2-nodes.json index 2f8ed2ea87..d97205703e 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls-2-nodes.json +++ b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls-2-nodes.json @@ -2,24 +2,24 @@ "network1": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network1:9500", - "tls": true, + "tls": "true", "tlsCACertPath": "/opt/iinagent/credentials/docker/ca-cert.pem" }, "Org2MSP": { "endpoint": "iin-agent-Org2MSP-network1:9510", - "tls": true, + "tls": "true", "tlsCACertPath": "/opt/iinagent/credentials/docker/ca-cert.pem" } }, "network2": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network2:9501", - "tls": true, + "tls": "true", "tlsCACertPath": "/opt/iinagent/credentials/docker/ca-cert.pem" }, "Org2MSP": { "endpoint": "iin-agent-Org2MSP-network2:9511", - "tls": true, + "tls": "true", "tlsCACertPath": "/opt/iinagent/credentials/docker/ca-cert.pem" } } diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls.json b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls.json index 68f2f4d459..1b9e2b2182 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls.json +++ b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig-tls.json @@ -2,14 +2,14 @@ "network1": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network1:9500", - "tls": true, + "tls": "true", "tlsCACertPath": "/opt/iinagent/credentials/docker/ca-cert.pem" } }, "network2": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network2:9501", - "tls": true, + "tls": "true", "tlsCACertPath": "/opt/iinagent/credentials/docker/ca-cert.pem" } } diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig.json b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig.json index 8269c7fbc2..c7031abb1c 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig.json +++ b/weaver/core/identity-management/iin-agent/docker-testnet/configs/dnsconfig.json @@ -2,14 +2,14 @@ "network1": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network1:9500", - "tls": false, + "tls": "false", "tlsCACertPath": "" } }, "network2": { "Org1MSP": { "endpoint": "iin-agent-Org1MSP-network2:9501", - "tls": false, + "tls": "false", "tlsCACertPath": "" } } diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls index 0921da2f17..8ed41ebbf2 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls @@ -1,7 +1,7 @@ IIN_AGENT_PORT=9500 IIN_AGENT_TLS=true -IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-driver-network1-cert.pem -IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-driver-network1-key.pem +IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network1-org1-cert.pem +IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network1-org1-key.pem MEMBER_ID=Org1MSP SECURITY_DOMAIN=network1 DLT_TYPE=fabric diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls index 35d5c540f7..49f320d481 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls @@ -1,7 +1,7 @@ IIN_AGENT_PORT=9510 IIN_AGENT_TLS=true -IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-driver-network1-cert.pem -IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-driver-network1-key.pem +IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network1-org2-cert.pem +IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network1-org2-key.pem MEMBER_ID=Org2MSP SECURITY_DOMAIN=network1 DLT_TYPE=fabric diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls index e4f190fdf9..e18aa89bf9 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls @@ -1,7 +1,7 @@ IIN_AGENT_PORT=9501 IIN_AGENT_TLS=true -IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-driver-network2-cert.pem -IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-driver-network2-key.pem +IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network2-org1-cert.pem +IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network2-org1-key.pem MEMBER_ID=Org1MSP SECURITY_DOMAIN=network2 DLT_TYPE=fabric diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls index 596871398e..5b98ae8d34 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls @@ -1,7 +1,7 @@ IIN_AGENT_PORT=9511 IIN_AGENT_TLS=true -IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-driver-network2-cert.pem -IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-driver-network2-key.pem +IIN_AGENT_TLS_CERT_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network2-org2-cert.pem +IIN_AGENT_TLS_KEY_PATH=/opt/iinagent/credentials/docker/fabric-iin-agent-network2-org2-key.pem MEMBER_ID=Org2MSP SECURITY_DOMAIN=network2 DLT_TYPE=fabric diff --git a/weaver/core/identity-management/iin-agent/src/server.ts b/weaver/core/identity-management/iin-agent/src/server.ts index b097a415df..e55b42f9f8 100644 --- a/weaver/core/identity-management/iin-agent/src/server.ts +++ b/weaver/core/identity-management/iin-agent/src/server.ts @@ -289,7 +289,6 @@ if (process.env.IIN_AGENT_TLS === "true") { "Starting IIN agent server with TLS on", process.env.IIN_AGENT_ENDPOINT, ); - iinAgentServer.start(); loopSyncExternalState(); }) .catch((error) => { @@ -308,7 +307,6 @@ if (process.env.IIN_AGENT_TLS === "true") { "Starting IIN agent server without TLS on", process.env.IIN_AGENT_ENDPOINT, ); - iinAgentServer.start(); loopSyncExternalState(); }) .catch((error) => { diff --git a/weaver/core/relay/.gitignore b/weaver/core/relay/.gitignore index d54cbf8c58..def820feaf 100644 --- a/weaver/core/relay/.gitignore +++ b/weaver/core/relay/.gitignore @@ -4,3 +4,4 @@ protos-rs /db .env *.db +*.sql diff --git a/weaver/core/relay/config/Dummy_Relay.toml b/weaver/core/relay/config/Dummy_Relay.toml index 2c5b04ac5d..65767e5fdc 100644 --- a/weaver/core/relay/config/Dummy_Relay.toml +++ b/weaver/core/relay/config/Dummy_Relay.toml @@ -33,6 +33,11 @@ hostname="localhost" port="9085" tls=false tlsca_cert_path="credentials/fabric_ca_cert.pem" +[relays.Dummy_Relay2] +hostname="localhost" +port="9087" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" [relays.Fabric_Relay2] hostname="localhost" port="9083" @@ -53,6 +58,6 @@ tls=false tlsca_cert_path="credentials/fabric_ca_cert.pem" [drivers.Dummy] hostname="localhost" -port="9092" +port="9090" tls=false tlsca_cert_path="credentials/fabric_ca_cert.pem" diff --git a/weaver/core/relay/config/Dummy_Relay2.toml b/weaver/core/relay/config/Dummy_Relay2.toml new file mode 100644 index 0000000000..2a4be9dc4e --- /dev/null +++ b/weaver/core/relay/config/Dummy_Relay2.toml @@ -0,0 +1,63 @@ +name = "Dummy_Relay2" +port="9087" +hostname="localhost" +db_path="db/Dummy_Relay2/requests" +# This will be replaced by the task queue. +remote_db_path="db/Dummy_Relay2/remote_request" +db_satp_path="db/Dummy_Relay2/satp" +# max retries opening sled db if it is locked +db_open_max_retries=500 +# retry back off time in ms if sled db is locked +db_open_retry_backoff_msec=10 + +# FOR TLS +cert_path="credentials/fabric_cert.pem" +key_path="credentials/fabric_key" +tls=false + +# Networks map is used to identity the network behind the relay +# by its network name so the request can be routed to the right driver +[networks] +[networks.Dummy_Network2] +network="Dummy2" + +# Location of the remote relays +[relays] +[relays.Corda_Relay] +hostname="localhost" +port="9081" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" +[relays.Dummy_Relay] +hostname="localhost" +port="9085" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" +[relays.Dummy_Relay2] +hostname="localhost" +port="9087" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" +[relays.Fabric_Relay2] +hostname="localhost" +port="9083" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" + +# host and port of the driver identified by networks map +[drivers] +[drivers.Fabric] +hostname="localhost" +port="9090" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" +[drivers.Corda] +hostname="localhost" +port="9099" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" +[drivers.Dummy2] +hostname="localhost" +port="9095" +tls=false +tlsca_cert_path="credentials/fabric_ca_cert.pem" diff --git a/weaver/core/relay/credentials/docker/README.md b/weaver/core/relay/credentials/docker/README.md index 9036ee2014..22d4fe24df 100644 --- a/weaver/core/relay/credentials/docker/README.md +++ b/weaver/core/relay/credentials/docker/README.md @@ -17,16 +17,28 @@ The sample certificates and private keys in this folder were generated for relay * _Private key_: `relay-corda-key.pem` - Fabric `network1` driver: * _Certificate_: `fabric-driver-network1-cert.pem` - * _Private key_: `fabric-driver-network1-cert.pem` + * _Private key_: `fabric-driver-network1-key.pem` - Fabric `network2` driver: * _Certificate_: `fabric-driver-network2-cert.pem` - * _Private key_: `fabric-driver-network2-cert.pem` + * _Private key_: `fabric-driver-network2-key.pem` - Corda `Corda_Network` driver: * _Certificate_: `corda-driver-cert.pem` * _Private key_: `corda-driver-key.pem` - Corda `Corda_Network2` driver: * _Certificate_: `corda2-driver-cert.pem` * _Private key_: `corda2-driver-key.pem` +- Fabric `network1` `Org1MSP` IIN Agent: + * _Certificate_: `fabric-iin-agent-network1-org1-cert.pem` + * _Private key_: `fabric-iin-agent-network1-org1-key.pem` +- Fabric `network1` `Org2MSP` IIN Agent: + * _Certificate_: `fabric-iin-agent-network1-org2-cert.pem` + * _Private key_: `fabric-iin-agent-network1-org2-key.pem` +- Fabric `network2` `Org1MSP` IIN Agent: + * _Certificate_: `fabric-iin-agent-network2-org1-cert.pem` + * _Private key_: `fabric-iin-agent-network2-org1-key.pem` +- Fabric `network2` `Org2MSP` IIN Agent: + * _Certificate_: `fabric-iin-agent-network2-org2-cert.pem` + * _Private key_: `fabric-iin-agent-network2-org2-key.pem` ## Useful commands @@ -36,11 +48,11 @@ You can generate other certificates and keys for root CAs and the various compon - To create a self-signed key-cert pair, run: ```bash - openssl req -x509 -newkey rsa:4096 -keyout -out -sha256 -days 365 -nodes -addext "subjectAltName = DNS:localhost,IP:127.0.0.1" + openssl req -x509 -newkey rsa:4096 -keyout -out -sha256 -days -nodes -addext "subjectAltName = DNS:localhost,IP:127.0.0.1" ``` - The sample CA cert and key were generated thie following way: + The sample CA cert (5-year validity) and key were generated the following way: ```bash - openssl req -x509 -newkey rsa:4096 -keyout ca-key.pem -out ca-cert.pem -sha256 -days 365 -nodes -addext "subjectAltName = DNS:localhost,IP:127.0.0.1" + openssl req -x509 -newkey rsa:4096 -keyout ca-key.pem -out ca-cert.pem -sha256 -days 1826 -nodes -addext "subjectAltName = DNS:localhost,IP:127.0.0.1" ``` - The truststore in the folder was created the following way: @@ -50,11 +62,11 @@ You can generate other certificates and keys for root CAs and the various compon - To create a private key and CSR for a subject, run: ```bash - openssl req -newkey rsa:4096 -nodes -days 365 -keyout -out + openssl req -newkey rsa:4096 -nodes -days -keyout -out ``` - _Example_: the sample key and CSR for the Fabric `network1` relay were generated as follows: + _Example_: the sample key and CSR (5-year validity) for the Fabric `network1` relay were generated as follows: ```bash - openssl req -newkey rsa:4096 -nodes -days 365 -keyout relay-network1-key.pem -out relay-network1-csr.pem + openssl req -newkey rsa:4096 -nodes -days 1826 -keyout relay-network1-key.pem -out relay-network1-csr.pem ``` - To create a certificate signed by a CA, first create an extensions file (say `v3.ext`) containing the subject's alternative names to be embedded in the certificate (replace `` with the hostname or the docker container service name below): @@ -63,15 +75,15 @@ You can generate other certificates and keys for root CAs and the various compon ``` Then run: ```bash - openssl x509 -req -in -out -sha256 -days 365 -CA -CAkey -CAcreateserial -extfile v3.ext + openssl x509 -req -in -out -sha256 -days -CA -CAkey -CAcreateserial -extfile v3.ext ``` _Example_: the sample `v3.ext` used for the Corda `Corda_Network` driver contained the following (note the reference to the Docker container service name): ``` subjectAltName = DNS:corda-driver-Corda_Network,DNS:localhost,IP:127.0.0.1 ``` - The command to generate the Corda `Corda_Network` driver's certificate was as follows: + The command to generate the Corda `Corda_Network` driver's certificate (5-year validity) was as follows: ```bash - openssl x509 -req -in corda-driver-csr.pem -out corda-driver-cert.pem -sha256 -days 365 -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -extfile v3.ext + openssl x509 -req -in corda-driver-csr.pem -out corda-driver-cert.pem -sha256 -days 1826 -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -extfile v3.ext ``` - To examine the contents of a certificate, run: diff --git a/weaver/core/relay/credentials/docker/ca-cert.pem b/weaver/core/relay/credentials/docker/ca-cert.pem index 6eabbce0fa..0248112743 100644 --- a/weaver/core/relay/credentials/docker/ca-cert.pem +++ b/weaver/core/relay/credentials/docker/ca-cert.pem @@ -1,33 +1,33 @@ -----BEGIN CERTIFICATE----- -MIIFszCCA5ugAwIBAgIUCoSUk5KAFM6ZLnjcnfgF4CZqtZwwDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTExMTAyOTQ3WhcNMjIxMTExMTAyOTQ3WjBbMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxDzANBgNVBAMMBldlYXZlcjCCAiIwDQYJKoZIhvcNAQEBBQAD -ggIPADCCAgoCggIBAM0YiiuTlB1Fk3oH2je/HmkL9DI+HOO/N9jAuEfIA3sTWazK -G19k5k5t9Sd5kb00UQUxMkGm0jqwEWBsE9rFsLPAvw2ZZqE3ls0bLhoPxAdZTB/j -EoQuBfxhEmniEkgLbb3/VgrHmuX6fmvVV5wGNMaLtrfotY9WYgFl9BCW6kGT4y6q -Vy2F7vM3y17okcd0GJ7omQu+VghtfPU9fgv31hlDvwgbYv6X8c6Raz7GK4cBeGND -OWA8wWbvAz7yzk5H1kIICZP56qs2M7jvfE6TFtaTMWG1QnuAJtGEFz4w2oDD58F2 -CWxpXBiWF3RVpUn8XDdmjWyRwnYWuUefmgf2qbf9S9zmUKGSCV4s9CqqbFGK6gV3 -tXl1CFg2eAFLnLda9eVQ8mWMicvl+TrAl8ZnxqL6nxYazEEI2xseUtj/lcsqPpDM -8BAr2me+t7QpYMAlkoUo4sAcVyKvrBAeILxgMJSU+70XBa3wizXncUF2lSzfKEnl -CCP00AY9mgV8OY0Cu/53jaIFVf074HZ0H+umzo2oaX6asM69AzcchMrx3RWASHlb -nFOsbNKOo1++RBEBIpSnuVEQJ2M1PeGEhwoJTjT7ho9cGlb6DHXjpnBkDOVZoRMC -VHs3k0CNAu9hMZSg/ZcAba6xEHf2/PNn31gPb0o8h4Rf31dt75ExBr7w/n0DAgMB -AAGjbzBtMB0GA1UdDgQWBBQB+r//rP7TrVBAlT8neh5E3tQ8kTAfBgNVHSMEGDAW -gBQB+r//rP7TrVBAlT8neh5E3tQ8kTAPBgNVHRMBAf8EBTADAQH/MBoGA1UdEQQT -MBGCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAIOROHKphw/2s -4I57zwxWKO6xGoScnSZ+auFrY2aNT+mTYXdDHaIkp7gxEpYGn1hH5ghdvttZM2Ro -DuGR6FhZ4p3j0528XQMsPIOcgyd7XEA0PrEs5YXOi03rG9mRjl1/qad6o3MmLoez -5AZ9ESu+6xX2CxjcVDuFyepfflgT+oPfnlc9ue+bmotCwE/dSDJ2midtnUD9llRD -8LaPO48qIVsbovrfEsIBNjnxvDqggsk5nbck+H+b4aUZg6h78vHHIToIopfKyvod -aahR2QliIGpQiDknD2DsdYgf1PGZgpshnmL46YYVQduKvvbj2rcFjB5TAjzTngxX -vlmLi1U2OzcT7K+fAvILKPDBaQKVJb1+S7/+YsPJx15tk4TVBp2Dok7aQT70QbGw -gMheIKujdzMQlooJAYOHfrEvgkH813T2TeeGZ5V2T3VX2UNAP8z3aupVw55o9cWD -5BuDDilwIjmyZTLSqByc86mOwpU9fVNk918x1jmvyJQvWFc1p7rIWnbVXcw/NiLh -JnAb4hW1uCe4Rt/YfbHsnFGIWU/mRu9s0GZNYrYqI0RXtVZs54VLi1gkqPGTTjKe -NbuUBx6NM/DNEEoIM0gYBrJIb/O5vHlqsvS1ys7KQxhRCtFR39VNPvXT0/lzTqog -m4mifgx4yN3ft73r/r2t7shAUyOn+rg= +MIIFsTCCA5mgAwIBAgIUdTrEvP1Mgr+yGcaKVfgvYpjFinswDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTUxOTU3MDZaFw0yOTA1MTUxOTU3MDZaMFoxCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEOMAwGA1UEAwwFQ2FjdGkwggIiMA0GCSqGSIb3DQEBAQUAA4IC +DwAwggIKAoICAQDFf7gq8IyNx9nyYZX3jY+GGhDfyJuJzsmcR1Pc+NLOOE8sRHhU +YXVJ42gDXTB85/oa5QGu+Scvh3meewnweBD2T8DrRccA5iAGTIrvI3dilJLYGPx5 +GhzFnp/qY/9Cv3Jsjioo08BHrqAiFtKJuNgrueHc9YJbRz3qZSp/38g/E96fFRp/ +sAlYkdYjlIbYaepm89SuVtMmyKwoERMWsAqJXlAYiTXtNwZi0nT3Xjt+FCYiwkCT +XsuwL9FCI+oTGoA4ieSxUFg2AbU540X5OjtEFlJ5InwfSs7E+0w2K/o56A+Cjw2i +5woeDDU8Rz2R/VbUA80w2sHdqHThJ/LskYLvGPbyt3yy1R8FknkDf2+xGhDcLR4E +BJ7DiclKMOMJ6xHv9fgFXXOaQPSlqX4ZarrHf162W3pczaVyQ94a5SOyocPK9CEF +sLGiBDFK6OcgbG8Oh3vifdnUUwqBxC7vJoABeusDkNitmZsV+iwXuB5RtpfXunYE +qLMe2UoUUbgqzDVs4CflDAR8/wiDAotHpCVS4jHqw4Fhlpf6tgx9hMxAJUl+nN8m +oKwuehnyMS2ojXvbyWbJYSAFGIR8KKB544eBMvqGKc/L73x6DEzgpxAfdahtuw2l +PvugZweEEuab1JCAzDA3EjV+nuEGQzXmIOnKbWVBea98LJr7EuWQbrZ0CwIDAQAB +o28wbTAdBgNVHQ4EFgQUVmEJb+dpt5N7ZI5c1wbHX650oo4wHwYDVR0jBBgwFoAU +VmEJb+dpt5N7ZI5c1wbHX650oo4wDwYDVR0TAQH/BAUwAwEB/zAaBgNVHREEEzAR +gglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggIBAD9rRYE2WqsbEOM6 +D+xiEXhWG1XJ3+X6DvM1pjApXBPNFeHPo/Y26cYYm1OFYvrGHbQMtAp8lNEj0Iju +jngIXz1bYoLQWMeyyapH4MXJaDe8g2QBiYoMH/ct0LNoBSZcKxc3sIRDFSdwy9NA +P2vN/vFh6XKTdCtGtcI/r40pcSlDHE3BGpHxvKM1LR2eDyutl6zY2kbmHSexBIYT +Dw4qS3A/1tgx6YhALqFa1D2rl+VlqoTrdMaYGy4EEPOuZbZ7aGjg/JDAc4DZP8MV +0svKV1iiQHBPXaee15eLfyY7KJgjng2fYIuSHR0+HCw14shKFtGv5BTm9qwoo3aC +/Kon8RuU8Z+1PTRdXxmPfjfdB73/bfCgHMkpVEdvO+gvxiTReKLBetoKNRMo+5TJ +K3Ux4Sba3DNCOCxUIKDjT9X6zst5dS2SznC85bVlW8uNCGa9O/3Uh2rwEc9041Pw +hOa1qRlfI2EdRbo+GBBz5rJ88bJ7jWspsAUT02Kh/Xo4OiG46m/RFW3p2Gt+Epzs +5YbWNnB8lvjf6Wbu/cTODdi6Qj4nYimAM3Dg8s6Zl8Uok8+quDbbaSPQt1JjjzQ6 +RZBZsSiskCn4A3d8LUwcLq/UGhTGIPPM1nqo7BbAO9UAVXQVBtY63EKdgPXmXkDY +b8fuHVtSTj5JW/hYJhnYuJzvkbQ+ -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/ca-key.pem b/weaver/core/relay/credentials/docker/ca-key.pem index b61273ccdd..4086e283f2 100644 --- a/weaver/core/relay/credentials/docker/ca-key.pem +++ b/weaver/core/relay/credentials/docker/ca-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -449qLsIMHznaBkvNB8nW3dDm+RxGwPg= +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 +I0fwRCyPBBNOvj5bvVu2XbTkuMLpbsaxG5vQ/nkCggEAGpMJkR1/CdpUUcwyQ3d9 +KucFHswMshwKTPZKCqPqbryqsKUL1z1z6DKCtb25cj2z17yXAbuPotk01lpa7tkk +KRTB2ulC3x7fecpMqD5dXeVglDS5lRgB2OpobDn9n2raK9Z7XycO+2njl7P+0zjx +CuhosX+Xskd5igyw4ophFmOsnswDG+LRQpZwE4CJiai2Sr1rUpyEztthaegwk7r6 +IYJpuZ/tnrALiA/E3d5yny1ML8Y3x+JbIYUsKI4D5jdDLl3YZcNx0Ry72KkISJ3U +imX/7Wq5/FNkJ/akCsgqoUty3nywsxx3ztUVrdTIyx3WLXe8iekLUWjMMe8T2SeF +BwKCAQEA7CfevhhftLx54BHH3VGpuSIYpb8G6C1t/B6F6ZxljxXnGSZZK5uWrPIo +wjtUZLJjbCKK0TErOU9j0SBHO7LOX2TxEWsVVsy7wQlWuVwC78qJvTN1Aeo2PmRL +qRnM0uq3rVU62az2+oHHqeG7z6YTEN6Y5o7dg2TeN9u+7MwmgCcIkt1mF5cDJPlk +dVZwOW2IvXnPgVXklOqhXRzV8ZevRCwo7+8csSWjElK5BByLFmh+LOpv/bRNG5hf +5uR8enwPvg7yfk5+NS4DtJOmO+YSyuG137ZXb4H+i93moc/ni5e5YJNmCFdjfunR +S4KTjOHktrJTMyHa9wsNSUnuk6AQrA== -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/corda-driver-cert.pem b/weaver/core/relay/credentials/docker/corda-driver-cert.pem index ebd1829f58..f1ebcb9ddd 100644 --- a/weaver/core/relay/credentials/docker/corda-driver-cert.pem +++ b/weaver/core/relay/credentials/docker/corda-driver-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFkjCCA3qgAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWFAwDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTE1MTI0NzE5WhcNMjIxMTE1MTI0NzE5WjBvMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxIzAhBgNVBAMMGmNvcmRhLWRyaXZlci1Db3JkYV9OZXR3b3Jr -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAt0hXxU2ucr6eTtSW4dg0 -kQbNGdbbo0D8m/e7c1IiltlmxEgUHnq2CK8RN0saBSbug3OENSPlzHEBszSGAePv -TqOmaECBx6da91YFERkmMaIPa/8HGjJ+ewPMiCdax+PZXcp9yiP9dEg4tEtNyOgF -eVZ9ZnyoKgARq+xI1JQJw/OqujrJgUFLS6gZ1zcLfvUrVtgw1QooDKXzwcXGap/e -eJGj30L1/PAnemDk+3sy3vF69layzkcdEHixL8HVJd81qC+OSqNK2LBzNIKJC05w -97H8TSnUN94Jddl9uu+MtbM+GM/obcfaxeJuXyhgiuoeG9gaDbInMKtzY7vIa23g -WtiiqiyulEuEDS6sZW349oLEwyaSFKwWHXuu6MerZxLQh+dEz64+kK7GLmr5t7iJ -2M8uCboUvGznYcaQLcGKAK0QiAFlJl7mGU5el3ijnxJsNYLquOIXajjzW+mberx1 -JTKUbjfvCx7W9/1hP2lr98IWSUqP/UKaynzLZRt/lNPv0ksjNvQSgw5ruIEvwEzo -U9TQTQtpet5QbZ3Nd2WJvYzHsI4sLKgza891GKJDH/2IrAv4reZ8otOiQEUy8Wz4 -MZHtquuijOPso6906sfh+PuNiC3feu90AEDRKdW6ePurfkGNc/7IdGgIF7pBdZM5 -vymM0veHYx9z37n6DU3lvIECAwEAAaM6MDgwNgYDVR0RBC8wLYIaY29yZGEtZHJp -dmVyLUNvcmRhX05ldHdvcmuCCWxvY2FsaG9zdIcEfwAAATANBgkqhkiG9w0BAQsF -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 -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/corda-driver-csr.pem b/weaver/core/relay/credentials/docker/corda-driver-csr.pem index 632f98a4e1..6f2c8447c8 100644 --- a/weaver/core/relay/credentials/docker/corda-driver-csr.pem +++ b/weaver/core/relay/credentials/docker/corda-driver-csr.pem @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIEyTCCArECAQAwbzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEtDCCApwCAQAwbzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMSMwIQYDVQQD -DBpjb3JkYS1kcml2ZXItQ29yZGFfTmV0d29yazCCAiIwDQYJKoZIhvcNAQEBBQAD -ggIPADCCAgoCggIBALdIV8VNrnK+nk7UluHYNJEGzRnW26NA/Jv3u3NSIpbZZsRI -FB56tgivETdLGgUm7oNzhDUj5cxxAbM0hgHj706jpmhAgcenWvdWBREZJjGiD2v/ -BxoyfnsDzIgnWsfj2V3Kfcoj/XRIOLRLTcjoBXlWfWZ8qCoAEavsSNSUCcPzqro6 -yYFBS0uoGdc3C371K1bYMNUKKAyl88HFxmqf3niRo99C9fzwJ3pg5Pt7Mt7xevZW -ss5HHRB4sS/B1SXfNagvjkqjStiwczSCiQtOcPex/E0p1DfeCXXZfbrvjLWzPhjP -6G3H2sXibl8oYIrqHhvYGg2yJzCrc2O7yGtt4FrYoqosrpRLhA0urGVt+PaCxMMm -khSsFh17rujHq2cS0IfnRM+uPpCuxi5q+be4idjPLgm6FLxs52HGkC3BigCtEIgB -ZSZe5hlOXpd4o58SbDWC6rjiF2o481vpm3q8dSUylG437wse1vf9YT9pa/fCFklK -j/1Cmsp8y2Ubf5TT79JLIzb0EoMOa7iBL8BM6FPU0E0LaXreUG2dzXdlib2Mx7CO -LCyoM2vPdRiiQx/9iKwL+K3mfKLTokBFMvFs+DGR7arroozj7KOvdOrH4fj7jYgt -33rvdABA0SnVunj7q35BjXP+yHRoCBe6QXWTOb8pjNL3h2Mfc9+5+g1N5byBAgMB -AAGgFTATBgkqhkiG9w0BCQcxBgwEYWJjZDANBgkqhkiG9w0BAQsFAAOCAgEAhO/A -C2o+UCz42+8zWFF7A7o9nqxd5iT5+z3YDcAofD5xyyJro+pmbVe4tR9LTdRo6834 -5MuAIpqkC5hyYaV/GeDoA9nE0YzWGGHCIKc+OlxErmqXgt2w6D1CkQIkuyU0minZ -vuvRkqwdN9H61Uyx499j9S4ufDaWZ4Kecb3M7JOFaedjyGfaSONSS9mMmFmHERB/ -8GZadiwYtHeWYWxbZXqNqGNQ35UgZxM9AJx7Ts0iKIgo7X1dO8dFa72wkdD9Uhds -Php/Nwxr5k2yI4+s0G/u+YlUOu35JyyOpcSLN4dubtruBRel3ytXFZwSu6XkFif9 -ZmeUpH2XXVQwILg83iMSUlO+PwcfjOSSfAbyE0lyIP2XNqZQiyXAncM12MUSKMY/ -5AZIFNSuH8KVdN1QMEtvPKNbUPBUFNznWu2muTALfkvIygCcLBsq3z09MkS/rrTM -YUis9TMXI98PsGhHE0jEzFQbWuXiKXYkHDapXfVxfnOEn21SthWYNVLq4chp0WGg -k6NtKr8GgvUU+ZS2mtkYIu0wH7pIlb7Z5/JB+gvS/rNQENu3lfEo+TDDs1JN+Git -aFdlmrR/a2l7aqRoQ7HXh/O6ZQPA2mBv9Pa7JH8Ayck8ECGV1rD98u7f5XkmsLOp -ZNTzygE3ldKlJ7A277fySCk9ReIJZWTUD8UYLuI= +DBpkcml2ZXItY29yZGEtQ29yZGFfTmV0d29yazCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAKZLP8crnSYeD/tzteYcDCHSjHIJOmBZ7hCFm+Wyrnwh8Lji +aNXmbZUv+xIhASO1Wk5gHu3RBbrFdhdcK8tm3Uk2iAra9UXHg07WqossPjrywQ1k +KkVKNIfekxb6yxbSYpsYFyTvxYdKovhh3HWd7lBqoSC7RqPkl8HBkUQYrPb4kRkz +2l5InNWEZldmi2uWuFCYputc0hCSF3sby6QQZ+6tKsk+kPend5SlHz2hkKlig1k7 +2wUY2jLKcMDvlhlJe94P8idgowft6144m/L4HuaYu2z5EPOv6+O3D15sFc368wet +sScZHEyiKEEz2cvJLHYqfXzRnbo0y3s3dlx8aZLAQwA0ZanU7aVbTo2HLQjfjp6u +rLeJi7Ij5J+Jg2zj0VRKvBEYh0RulzdInqjzZnPnJviAFyxHeZVWFK4i3Kvr3W11 +B32K4WdrZ/23XxvoRa/YvzNXJIJk1MlMMFmInLUw3Pcdfd2OtEn99BldBdzw4LFC +G5XSLXQ0kEKj6mFbBU2IXX/WJlbuISUSgPca7yzMdrqSUCXmMW5P4T5FSVbuwy6g +NGivgNR6bxVUPmyfAK7V2kbQr+Y8749zKTqPfX5AQpMMLiJAA777GR45O45GFwli +hkuBA3C3UiA4g7wC/xIplehi+6HdiEAvipQuN45ZIKOIpLUzdihrfDmAVmDvAgMB +AAGgADANBgkqhkiG9w0BAQsFAAOCAgEAnxDfFH0oijSE1buTNr5TBRF25CmHi09G +SoJDp/sXwJjmI7QwGXRcvs2Q7sqt0uAS8Flt3bq7nVDXTTqPGytpUu1oERerVHU/ +2xKpcX/BiGSpCOSQWntdXSLveqfDV66IKPtGn3VP9TKjldfI/iNCwjnA27UGhzPC +EylzMtjrpQMIdL7wAslVamULTK2bxbRGeeZePEAHMnFxWqKb7PT/kskZuvVCjOC3 +jcBbSctFBcb7gzPcR2G0jztG5N8Qre4NS66cnUEyugQ9lvWYKfDmPlEEAWGEPbMU +fCL/RkX8Hxnuj9nsRljoupve3lPSKOcqRRUyHQ6GoQhb+sZdUI6f1QFMd1h7QsTD +lYT0uxZf7QffXoplhf7l7sgBWfrDMCqsC7wjnoNXcX2fMbry3Bkx0JDqCEreMgpX +OQKMrvY7l9vv8tMNG6/V1IEzzlj/mteW74ODjVSwxbucE0dL+0ZLt9sYhMCKPO3P +jijoCbXXUSYBVXsyGbu6aWUHVquSVPtrgOw+IjXQkMr51/qN3hzUjB5vOz0rquN8 +4Tolqjw+qktInLMG9PYj6KfZecN4uHIc1ExCI5+xTuKNS/yJxK4HZ1MhNw6jbBiW +0+qI9lVXlhTIP9ZpUnmGCfzTD3j8r8n8EwUVy6dJBMdrItUQcpScNtkEjfBh1OnM ++g1peRz3ElQ= -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/corda-driver-key.pem b/weaver/core/relay/credentials/docker/corda-driver-key.pem index f23eecd030..54c2591b3b 100644 --- a/weaver/core/relay/credentials/docker/corda-driver-key.pem +++ b/weaver/core/relay/credentials/docker/corda-driver-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQC3SFfFTa5yvp5O -1Jbh2DSRBs0Z1tujQPyb97tzUiKW2WbESBQeerYIrxE3SxoFJu6Dc4Q1I+XMcQGz -NIYB4+9Oo6ZoQIHHp1r3VgURGSYxog9r/wcaMn57A8yIJ1rH49ldyn3KI/10SDi0 -S03I6AV5Vn1mfKgqABGr7EjUlAnD86q6OsmBQUtLqBnXNwt+9StW2DDVCigMpfPB -xcZqn954kaPfQvX88Cd6YOT7ezLe8Xr2VrLORx0QeLEvwdUl3zWoL45Ko0rYsHM0 -gokLTnD3sfxNKdQ33gl12X2674y1sz4Yz+htx9rF4m5fKGCK6h4b2BoNsicwq3Nj -u8hrbeBa2KKqLK6US4QNLqxlbfj2gsTDJpIUrBYde67ox6tnEtCH50TPrj6QrsYu -avm3uInYzy4JuhS8bOdhxpAtwYoArRCIAWUmXuYZTl6XeKOfEmw1guq44hdqOPNb -6Zt6vHUlMpRuN+8LHtb3/WE/aWv3whZJSo/9QprKfMtlG3+U0+/SSyM29BKDDmu4 -gS/ATOhT1NBNC2l63lBtnc13ZYm9jMewjiwsqDNrz3UYokMf/YisC/it5nyi06JA -RTLxbPgxke2q66KM4+yjr3Tqx+H4+42ILd9673QAQNEp1bp4+6t+QY1z/sh0aAgX -ukF1kzm/KYzS94djH3PfufoNTeW8gQIDAQABAoICAQC1NGbigOzKMT+evHv4CaPf -BpRcyZoZC7U0FndTio78CTCbOo/5mmTCrSMeQbgWA+moONsrFrSprch6fqFG2S3N -1+o8BBrLY+CBzJ/xyaWDSLBqm5dQBUAbKyRaMF6GZfSP0BURdwesoYK+bf0Xdp2C -20nbu78e1zahfVh8I2iMPSo8OMbkbcOdpzL1HkzVVltk3xVYa1QxPRmEKJ8E584x -8fvMTg2Z522Ahq+dGq6u0Jw7VHgvjQtlL44uozqy2L3Z7DqH/G2RUtJzxeLsNL9n -hKbnO0W/flxoEYFHAnNhaTcpnNQ1RXQ8VKO+nNLmRJVD/iG0DMDGU5wfrJZ38Afw -3QOebtTm/X0sC9a5qW+XvyV3j5O8hHpoyhWUTHez7mcYbVGALn3VHfQAXG5XCf50 -nZLLtJQ8wqufW3VMA00WG4pjhANTf9+2HiJjoFMPatwDHk5zlpNWbdo9Bg7rjBxO -lPksH/rQHaCUmHp+ave241ZdWw6zpaC70JyL93mepVeOapFZKtRiFMJOVKxz/ZeV -DqKP69s1L9uWMwKaFE4LBCRDMfEJvXc9H8qSSmBg3o5/58nfJVM6ztVRZCHtWoAD -YuBO2OFvlc7f2c8yHCstmc7S9/B5hLSpASyZdlWEmJMdxBdWbVCpMIC0pkAV+SYu -4Gsyg5yD0GTnZY1P+nJZ4QKCAQEA2/wCOwIuQGOXhOn1Mk99ZpyVCxDL7lEViWSz -dWoHbS8U0U1DHQKM7BkX1Daen4UFeb9AwF37lST2t+/BVh6yd4ix1w+IL4GPoknk -w6+aqX+cox0ezSedfuEsXdh6MDQ/9XNQfqBuQIxBnOLxTMM3f4lBzqWvCyYpDbDj -snAR6pLYqAnLne69fySdkmleOMwqBPZ7rOrOy01kPqV7o80FjtAKxmtqLJ+hM65/ -9q095Y1DKiLlCE2P/d8nw1kHqcyg/oQT03ukSIrnM/rSYyv39IS+pF4Vehyvfn0R -R7orlEXilUcoFRo6xejBQ+tQ7RccKY30svXZH/V414iOY3atVQKCAQEA1UoWMMPu -bgr/7YACMIwAgdu92RV4JvkHZC/23zPmMX/SyvQzXK+xcEkqqH/Olrmu7eNBRwbl -y/XWD7DakhZIXfiN0DmZdoFxdg+eON2r5ncKKdikLzD4nhhuxrv8m84d3fuV2FGP -UJE8kF35gfpIuQcs0rfXPkoOmCcfZvfcPVAYjJJcI+qnF9SBr56L823d+dPdj2lT -KDm/5ZjZzm1gtMpE6swZq8iI5EUFBK1xIaIDTyTVDEpVt41orML3xViA8TXDJqis -QTXr1AWxFepU7TmOHIAB+dEcD8DnSkcHeJvIWpJh7NRDYTVK8f/WRbsOwbhKxkJp -OZgViDEzBrayfQKCAQEAluNMRF1CjDfDfg9bd56+TNup/2UN+/Dx7MN9tFN9tI5O -oSF1nzhYoLi1d4HfW1tKXi+ooknUfoBUGeYBnqh/kS3ZjcHBj5Q2iQJWP0L7urcl -IVyf++foR1b7r4MEjHvKQvlNhQ1VkkCh4JJpIFXmgzwKP0u1vNf34MQr6gCkyVjf -8qKFX1aZ89ORoRNU5XBkgfLu8bQ9E4WJ9M5c+AVwgnyAZ4jV0rXLRD+01eYORp2W -LBizL/bDhUbDZ2Jxty38X5cIYk60aG2eGDE6jXtjH/zNJsDBynhSh1gRujkgGxu0 -Rt//xjmvhoAX0BZf87+eOYJ9DSNEQn+E25F22RJV4QKCAQEAi+uTTSBr3NLoe/Sa -+yANASOXkr7L2L1LhQUWLezNGTHipfO3chlsDN5i1rEpZKWhRTvtSdwTik7Ww+pg -KK/nf4Yb+jqfGyflt+6c/G8nYwQ6raMKak70+jnLCiKun8OCwmpWLderbc4pbgfI -M+VuKbu0QvQJhzpsApK/vfviBnLx993YBlPck/x7qysWYnZzxX2gfoE45U2lPsic -Mhh89X0v4txMBu6CJ0XD+gKSEd9Hzna6MNrfCpAA2Dz68AKUbCi5wjWq8widkbS+ -LENSvWEhgj7TjQAKKaeB069vDkccE5auGQBSx4V/iewstAf3sUvl+dP9VaQYlAS6 -la/qvQKCAQEAllajaIDFMrkNV5794LjQ4M4IEQl7oq/bOy+p7QDBEnoH7crjYmyG -mcv9sSz4WIgupVX2u0x82XRs7RaRRZK9BCGGS9ligMdpPT7A4fouquPyKHC8X5TC -g1IifzAIl9uyNAsPopdQ8qg5tuQVORCbc3Q/jzznj0D3om6CTDuhrJA4DGbN+aLT -IEEQK4rgmpXclpeHbPz2pE7wKk0fnIIRtAn9+52Ej6l7s6HBbUnm+KO35/anrgSo -SV2EvHx9zMcxX7yaTPO6JFav3LvKwOWKIaSoNcbPXZvG1GIIEhapAXITHUSSwE6Q -+yN9JbnDONswNc245LybP/481VJ0/I4LZw== +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 +zdyT4UyavzUrpnKlLQxgIuRHdzGltAI= -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/corda2-driver-cert.pem b/weaver/core/relay/credentials/docker/corda2-driver-cert.pem index ce7c2ba9bd..3b14e1aaf0 100644 --- a/weaver/core/relay/credentials/docker/corda2-driver-cert.pem +++ b/weaver/core/relay/credentials/docker/corda2-driver-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFlDCCA3ygAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWFIwDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTIwMTQzMDU5WhcNMjIxMTIwMTQzMDU5WjBwMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxJDAiBgNVBAMMG2NvcmRhLWRyaXZlci1Db3JkYV9OZXR3b3Jr -MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALnHQN9Tnc2CiaFri7Ez -cihBPJerhIqAVyAciKMKdEBpaqkFWXCRAAlS+FRO/mHJEOrG91lzK/JFA4mHRdcH -i0ghbVwR/RcLnolTHW86HtCGcvJJEI8I9OtF4YmDBSTRRkZ5nyIiluqdNgAQ/m+f -RWip3y+YFb2LMmZDl1mRr2xpCaqhDkb78V8xquBLQZP24Ki4QfU02PLO2O8XNC1j -53niAYgFz2ZzfYROZxQoiiUm3QNZ8f4IvvvNQvhChghAEGNL3XCQeecO93B1QaYX -QpxK72oBmUfj2wpv9Xq7J4waJMk3BHFCKpw+IoxlYf7yyl5G7PRPb9JVxUUoswxA -VX5cSK7AkXAkvWxM35SEB17Rv/spjHcNLGEwm4EuHR5oVBPGJCxAeXLeS30rMEko -4chqHCeIExe0fw52jL3qaYiUvxS+Mrpnmeyd0DXuNnW65k8nh7FJK7eSH8c41zgA -+yDPoC2X1ks+uGh9WIzMAe8Wa/2Fkj9r5DPTI7v9R8MKSAcM9O3kd4gjkb6Ao2Nn -Rn4ZGBvmAWS8FpSk/v7kuUUAIhoeC4o/6E+z8SeuvutV8gV2/xTmtWPzunWZ5CrP -dfVXN40L3QaNYx36v+25wCJCxDIGvf7Xhr/Gm1EIXaIrYI8Wv1R85hW8i9T/M0q2 -9TOLg495+uWRKT8+mBwGUhItAgMBAAGjOzA5MDcGA1UdEQQwMC6CG2NvcmRhLWRy -aXZlci1Db3JkYV9OZXR3b3JrMoIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEB -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 -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/corda2-driver-csr.pem b/weaver/core/relay/credentials/docker/corda2-driver-csr.pem index d0d51faa85..bbb7d58dfa 100644 --- a/weaver/core/relay/credentials/docker/corda2-driver-csr.pem +++ b/weaver/core/relay/credentials/docker/corda2-driver-csr.pem @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIEyjCCArICAQAwcDELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEtTCCAp0CAQAwcDELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMSQwIgYDVQQD -DBtjb3JkYS1kcml2ZXItQ29yZGFfTmV0d29yazIwggIiMA0GCSqGSIb3DQEBAQUA -A4ICDwAwggIKAoICAQC5x0DfU53Ngomha4uxM3IoQTyXq4SKgFcgHIijCnRAaWqp -BVlwkQAJUvhUTv5hyRDqxvdZcyvyRQOJh0XXB4tIIW1cEf0XC56JUx1vOh7QhnLy -SRCPCPTrReGJgwUk0UZGeZ8iIpbqnTYAEP5vn0Voqd8vmBW9izJmQ5dZka9saQmq -oQ5G+/FfMargS0GT9uCouEH1NNjyztjvFzQtY+d54gGIBc9mc32ETmcUKIolJt0D -WfH+CL77zUL4QoYIQBBjS91wkHnnDvdwdUGmF0KcSu9qAZlH49sKb/V6uyeMGiTJ -NwRxQiqcPiKMZWH+8speRuz0T2/SVcVFKLMMQFV+XEiuwJFwJL1sTN+UhAde0b/7 -KYx3DSxhMJuBLh0eaFQTxiQsQHly3kt9KzBJKOHIahwniBMXtH8Odoy96mmIlL8U -vjK6Z5nsndA17jZ1uuZPJ4exSSu3kh/HONc4APsgz6Atl9ZLPrhofViMzAHvFmv9 -hZI/a+Qz0yO7/UfDCkgHDPTt5HeII5G+gKNjZ0Z+GRgb5gFkvBaUpP7+5LlFACIa -HguKP+hPs/Enrr7rVfIFdv8U5rVj87p1meQqz3X1VzeNC90GjWMd+r/tucAiQsQy -Br3+14a/xptRCF2iK2CPFr9UfOYVvIvU/zNKtvUzi4OPefrlkSk/PpgcBlISLQID -AQABoBUwEwYJKoZIhvcNAQkHMQYMBGFiY2QwDQYJKoZIhvcNAQELBQADggIBAGAt -IBYPrXhzGlgGedrei2CEUBqnuGGhh01o5qcBPtETB3Bblwlf+AerrRW9rsOOztP6 -h5NbhAhJapxjog8J4Z4hdLxlnnmOt3qV/gfV4w5bymJyfL/9Z1bmjZvFKvhZDsjd -+HJjN8BHVI0bOb0ky9F3DmoijLf6mvnea1lKnF/hliCkfQBRA0v6mpoFAbQtNSRr -AjOCdmKNAj/0YNQNQ52Dvq2YPQv/SqsPhTKNHnGi2zPlcXlguU7NiHe9uXGvXZa1 -z2Pjj4o032/F3cyTEFtoDEM9/GFbQr08XquGBq+Bumb31P17ZEEkValH/aCPDRnu -B2qUaRwz6dqfI4d+wtW/soc3hN5I/oZDWNi7jKV7fmy46jmlBkXQiRtPEdapWdLW -mvF/J4NTSMf9+ONFMv7AOEeljGE0gR8Yv7EMQyz27wv+EbUGO0USXMvwfvnYnHyy -eIIsMnDNKOSR0AAQv37fQ1bZlBi8INFwebDfTcfI+UNG7/gdKi8FyuJafqybYW5N -lTwyjNsGZsrvsv9B1rbT9d6/ZQLUnaYvVxRoaXLqY93AKTAO3bcvTh74WWUnnwOw -WqXbmpvDx21ntJI/hJ03E3Bt5tByTwvQTNq1+4nSuFLHTxc9TleJ91QNXiEvMfbN -sgTFzTMknBc+j5bz3OJrlhF2heCYxHfEsBbE6AqY +DBtkcml2ZXItY29yZGEtQ29yZGFfTmV0d29yazIwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQCw5tQUrt7K7TjyhkDzVIul7IQIpBDvu1g54rMyDWqv5Yfp +eKpzc2FgpWXzeIPxiNzCaQINFVxlD5vxlypqpPTSFxQpf5rT7zk7gnOmXeL8YA7I +liyYWEOgJnI7aj/xOIHZHN/Acuzp0o/y3Uw6d63HSPF2Dao/l3ccJwF8dYdqac+x +bbxzqwo5mWXC8d9lhFIhF8mlDEPG8I+HFRzO3sQvsPWtILJeMfFKoMSbXnHpbJGh +BOQ/D8Lyc7Txu9mshAKrKUPgtwH5tGkox1+vXR3V807+FJpq/LEOGl8moS95wEs9 +fTZZGBV3xsZdTRQUfrVx0nWRo51UAlila8M7Q6tAD5GtpDR9vAhpa6TzFKtOxF6f +hTg93VH116KJmAaZziVvsTnyVEQnH2JPTpqMKGfF0pCS/mLqheSbWjiWN1pg8Mpj +DOIGGUgO610V3qO7AhbDi7auTCT8T6GnIWGdlxYei4P181V2CqiGLJhSwWzkxN3f +gMxorLK5OU07zGbvlAkcYa4keZfYJfcP4MPj0b6y7bx8CWiRjXLs/9gPxIJM0sju +H8sp5gONpeRMlN1p0pA2CIqFKCSxsSli1IvzfhDYD0P1QKb5my7fFcemkJzgGPSk +HxROhmtqjP0ut2Cd6PzG4iH6QU7xClxOy8hGcQ3XAxpkVQbzciQsBhrczq3PrQID +AQABoAAwDQYJKoZIhvcNAQELBQADggIBAGxuoNGgGharmSkXwSYFEJgblnjtCnUX +96/ftFDUQyYJelWiPuvgx6CfV6UdLh9YZNAY4gO8h52IHOgItuwIga06MqrluJfK +5Uil6ZsjJpX52j62c3dRM2oSQaWTLaL2Dsi0SUsF59yRrbx6ZeM9FNjsasb8iq3S +yUw6EIFxFF4kOXi423EfLBRxknCzGfIBupl1M1tpLolcPQzoOedcQJjQFA04ofCs +zwCRum9tyMpToRI17SCfU2nGEcFz+a9cUNS7rk5AAyPZXAm+IRI/cHzzxgD+WNbZ +u9JTOmCPM2HYNLmLGEAL9TjiMOxOQYvCgHn2gN/E2Yo/3GcBUHvo755wpSquxVwf +8J60wBdBNeW+Z1MjeNOLBHIDPC67bDix57NT18bcxrPtXuUsr93cCmjoAf0JU8aN +ZbSh9Xj7YvqJZBAS8NcZmU5k4Xay57bG20fDAnT0fhd1Ippu9dPRtjhhPO3JITKR +ODtEyR3LmZGDCNAL5Wsjwssc20yls6oBJL45krzEgBpM6vxyfdhN3xf0j6dMXOgk +xHrFju6soAUphDZXRdLV92oBLx1LOu5Ntr78YDf0RpYzkgoFoqR6MNwpAi6IIPfr +K2/Jcfp4WhVr/KfRmxWaEXkaEEQU4XA8cEI4tEVigN1d8ocSEQCb05zmTNfBLkMX +OeLnRuAfj8l+ -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/corda2-driver-key.pem b/weaver/core/relay/credentials/docker/corda2-driver-key.pem index d2d9696596..6acc383d0b 100644 --- a/weaver/core/relay/credentials/docker/corda2-driver-key.pem +++ b/weaver/core/relay/credentials/docker/corda2-driver-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -Q2d+OV7FUAscdf3EDEz+Wb/eevTj2EDG +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 +vdIEdvda5IhlGjfnzKgfhA+gUiZiWQ== -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/fabric-driver-network1-cert.pem b/weaver/core/relay/credentials/docker/fabric-driver-network1-cert.pem index c8fa705cbd..17f87d26a3 100644 --- a/weaver/core/relay/credentials/docker/fabric-driver-network1-cert.pem +++ b/weaver/core/relay/credentials/docker/fabric-driver-network1-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFijCCA3KgAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWE4wDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTExMjExMTA5WhcNMjIxMTExMjExMTA5WjBrMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxHzAdBgNVBAMMFmZhYnJpYy1kcml2ZXItbmV0d29yazEwggIi -MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwM7o9v20wgTG0uz/t31QapaRi -KhrOsikxUIdpMDXmDawzzS99dEYAe0TXKY6vksLwkiGqQ740JeXkkkzF9TWjbWc7 -xLnK5P/7RjivgQfRUXH2D3qoVvxADua9frrjizfg0U5xKXprbQy0P8A9hWPgNPRJ -gpIvLk5dNmexr29YQ0t3MUqSRnbRiQ7jt6I7hiRsUb4eMigfU1n5CqB4uSj0lL+L -/q5p/AlCWPeWMDUzb3YTyvMIeaBatVqMVyWwA7zXZ+oskYzbnWl1f+hJJLla4LRt -Wyg7XsPM87+ols/AVQ5fbCaP6mCttYPWk3veI+slJKvKNSmJqGKISJCdSw7RsslH -7OclKH1BdGr2JaNRiHKLwS5VW1K+JhUPkOlCY8qBd6abdaIsVcaACx3cW42EUozk -bWgd/JhexdXqw5oM0DJBd+0hT5RUyPRBVix/ktNlQGmwt92UdeudG12C6iALHddv -ZU814LxHJyqRjr63tfPvO279K7YXshhTIW72Fkv+LtnFRjE2GaWhQgXj7gHWkWKD -npfVwdkTI+bcrhxfz1mWBpSdjMjtcl43nw2MdrQ4gq9F3GPyo9IEU5VMdn47deuz -ctOuNh8m+/ddY8VUZsPpPGYiFLuZJUwZKwwf4fOkFGQIihR+tHaI0b2pFKImoCip -K4DbJZftvZFlrHBLXQIDAQABozYwNDAyBgNVHREEKzApghZmYWJyaWMtZHJpdmVy -LW5ldHdvcmsxgglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggIBAIWI -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 -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/fabric-driver-network1-csr.pem b/weaver/core/relay/credentials/docker/fabric-driver-network1-csr.pem index 7510224338..3b1235336c 100644 --- a/weaver/core/relay/credentials/docker/fabric-driver-network1-csr.pem +++ b/weaver/core/relay/credentials/docker/fabric-driver-network1-csr.pem @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIExTCCAq0CAQAwazELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEsDCCApgCAQAwazELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMR8wHQYDVQQD -DBZmYWJyaWMtZHJpdmVyLW5ldHdvcmsxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A -MIICCgKCAgEAsDO6Pb9tMIExtLs/7d9UGqWkYioazrIpMVCHaTA15g2sM80vfXRG -AHtE1ymOr5LC8JIhqkO+NCXl5JJMxfU1o21nO8S5yuT/+0Y4r4EH0VFx9g96qFb8 -QA7mvX6644s34NFOcSl6a20MtD/APYVj4DT0SYKSLy5OXTZnsa9vWENLdzFKkkZ2 -0YkO47eiO4YkbFG+HjIoH1NZ+QqgeLko9JS/i/6uafwJQlj3ljA1M292E8rzCHmg -WrVajFclsAO812fqLJGM251pdX/oSSS5WuC0bVsoO17DzPO/qJbPwFUOX2wmj+pg -rbWD1pN73iPrJSSryjUpiahiiEiQnUsO0bLJR+znJSh9QXRq9iWjUYhyi8EuVVtS -viYVD5DpQmPKgXemm3WiLFXGgAsd3FuNhFKM5G1oHfyYXsXV6sOaDNAyQXftIU+U -VMj0QVYsf5LTZUBpsLfdlHXrnRtdguogCx3Xb2VPNeC8RycqkY6+t7Xz7ztu/Su2 -F7IYUyFu9hZL/i7ZxUYxNhmloUIF4+4B1pFig56X1cHZEyPm3K4cX89ZlgaUnYzI -7XJeN58NjHa0OIKvRdxj8qPSBFOVTHZ+O3Xrs3LTrjYfJvv3XWPFVGbD6TxmIhS7 -mSVMGSsMH+HzpBRkCIoUfrR2iNG9qRSiJqAoqSuA2yWX7b2RZaxwS10CAwEAAaAV -MBMGCSqGSIb3DQEJBzEGDARhYmNkMA0GCSqGSIb3DQEBCwUAA4ICAQBNK9kmOMP2 -bOEtwbQgPZ2LmHUOtXeMqm2ORRpAT9KbYwlkV0tf6WLp1rGS6a/Ksx0zVEHovbNJ -lt/TPlGC8D9RZQ7dDDtHj+yOJN99dua7MUR5CbZl/ORliq0xQdWk1S4c1wqr6u5y -XLaHa6IMwSkFD1JO5R+i42aiB9KtCUBdIyQ6NJqnj2keeznOF83GZ3uYlk7oBj9T -URqEZBqLLqSXe/MDYLpGzeEvWqf6PkIX4xA5Jst+Sk9iJUn4O04NHqm8nU5HZYuB -XPty36ku+nbPrpzS2MDIWpFxOcsr0ti6BzPJH/3S/4pfQS8b5hOPZGXAh718Zjd1 -hjIRA7h76w4q24AXC3VyA/zdM00BQw7i/l+6GWGELWmUummZg+QeB3wr6yHS1H0R -xeOEYozzu+xW7pMNuA0sw4NoZ5LJEPo3nJO8Jd0m13Z4G1upDuxVZP7UTUpd+C6v -1WEWi16IsT3OoK8WzeOvKImcD8+a9g8GnmRCTjxUbpOg0YJse3xn106mB/Ebto4d -SeGtoavstzN20SQwnOpUSVOmyXlqMRL1SNneUHKRcP0shCoi+OEZ9v6TA6m/nJhG -v6eSRbLkGW7dXhZSgIkmfLgRBAbr0bgwpxgOang0UFFeikeR/ZtoNydkFaWqM/UW -gnd/hBzlZC8Hh2cFqC5dFQbk9CYM00F92w== +DBZkcml2ZXItZmFicmljLW5ldHdvcmsxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A +MIICCgKCAgEAoXDUO5ltmlZtQxUQQWoukz834QlUbQIq/zCkpNOXCpzWqBEqK5xd +DoI6/cugJlta+WTYNVsvttZZJPHJDOxaqGXSMLW+BjSWY9BNKbOQ+Bt+5hpvnR0D +ytF4kudqlNpDEmxRXgJ3PtYLlL/etS3vQuHdhJpdDTw/5Wo16/tAfwTJ7ZJegdDr +8q1VCleioip/MSRY6rWLd4RxjI6LfNm8Lo02VQc//0/OCj5PqLCuWuCMC/ZiJrJU +24ggVIXdQ8CWbngxiJ5hORxRg0NmUe45FAwASRygnJ3vDyrtvWphoukT8eyVL26J +OpAzTfpXCnkHcCgh2JoB78HW7CittL9J/Qa71UUfx8Oo4LzpDNxhMYGIymYDdPIy +7cwLC/7OYUAC1W1gpKOaMBb6Efn9Ra7riwNpQil3FlGVsdvmyFLw/J7W/RKqVRTs +gCGVBgNvJVeIMxS5ujzyo4gXQwkT19WR2jbTB6mloPnjHEp2uK9lF0I9sR6k2YbC +sLNO+XEMzCH4Iz336SV3Um//JZAO1SzbiXNkm8sI6OFVUssRKM+z5V5b4OYM4N2B +RnLhf/KeCdLWSyIwU9QNdk40UYXEYCZuKZkiK9qaAj2bA/LZVu6uCfyALboJMZdc +IKwy0Hud5hwgod4V23uTXlkxLLPWuWRCMKeyGl4chh9ISjMXJv1tYo0CAwEAAaAA +MA0GCSqGSIb3DQEBCwUAA4ICAQA0cLp+ZNSMpWEW3ssxyP3gMq7I9T4o4y2thTYW +qOp8Kw+geCMcVE88cO3NSSqxLeb/lxjOCrwXgSa3otzcMw3ue1yD7IYe9eSq/gb/ +SrRnsFZ4lQoMFcoxgWYEveETHdZGNVfAnhaCm2NVmLfDhy/ZROu+AH3gHzCAL0zc +TK4nDnzH6KLZuoDL2ZR/6RuIa7oRw0VeKF9ceaLWYrI30ChEU1/FnVZ5VPSkfGa2 +MHIqFhyiUDpOwSlqXK2UXOQfxAXX2I1jtUbPubr2BV2GjAYKmOiTiz812K2mcajJ +ndCni/JnS72HzSdw7eMtaBh7GKZKaaDxCDTzgcrSMjphRIiq2JTfOsQ48KVhJesF +jN+pVeGOQyXM1vJFmBEs+fTZ/CSHwhLNOfa/owUvyPxXCnh9grMZQk3Mcg8ATbPh +Dyje2vaHh+IVBpWVkYx+gXnyLNIMeU2iglm4kv6lY28YrgJVg6cXJrnIp450cqDq +g+D77nqiwyk5xK1nUpbb3KuRZEJBH9bNt7GP4B7fTZ4xJHIaRp6T8odDfldysBBL +jK3/R6mvlzBn2zb4Gl6JwyJbDYQjTV8P8WCCWADOLQps26N9ciBNDoYSOn9HiMi/ +LVcLyH+bqtDmiUIwC6+0gKYRnLZofLtVFbZlmUMGH2hcj+ams84rRLgc9KNrhkcs +fuUiIA== -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/fabric-driver-network1-key.pem b/weaver/core/relay/credentials/docker/fabric-driver-network1-key.pem index 5a0248a39b..07344c4161 100644 --- a/weaver/core/relay/credentials/docker/fabric-driver-network1-key.pem +++ b/weaver/core/relay/credentials/docker/fabric-driver-network1-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -nEbD/1JxiHNUlMfOG0YNSHc6zOzsSA== +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 +2QqFNRKvvJologPCvXNr2RzCotjVbE9X -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/fabric-driver-network2-cert.pem b/weaver/core/relay/credentials/docker/fabric-driver-network2-cert.pem index b4fb07996f..0cc1459a0b 100644 --- a/weaver/core/relay/credentials/docker/fabric-driver-network2-cert.pem +++ b/weaver/core/relay/credentials/docker/fabric-driver-network2-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFijCCA3KgAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWE0wDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTExMjExMDQwWhcNMjIxMTExMjExMDQwWjBrMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxHzAdBgNVBAMMFmZhYnJpYy1kcml2ZXItbmV0d29yazIwggIi -MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnxp2xv1e1GOcImNFEXh7tNHzU -/HRMCioaSAJQMrigTJtsw8haGDNF0NOQT1OLkubWFLnapah2bUfurdUKWGlVCcFP -2AJzzib9LWBAhL9ObxtBDTay4ABbXqxKpFQrt9m/qNveGOjvin2XRvRQ3fme6rxI -+8fE9iZ1pddu1a9evAVXSg4i6vVhe9+RAIM4yP8AVqSUvth2GSOwm/qbsRRKhmiF -JzpsHuDNQzFvA9Y3Z7qSjz09wH+07EGK5+fnw3uVce0y2a6o12VGkbDIZboo42nc -O0kvwUzq+kGXfcCgPd+fxbl4nk+zAWhAjSCiaGNhjwLjIk5ksnlZY6knzbRTZlf3 -zNFY9+PtZB+R/cmsVqlJl4dQb/jL1BJG/AqNYcPtpaCb85r/cgrRiT1vy2fN4XUi -+ZOw87IDGw+Uh5Ta9SEsCSjGZhAUJY8WbQz5X0tFcLHHx7CO2iK89zC3ylQMF7fU -F/a0SFdUDzkycSSKnncOstjDheyaz+nc6ptsUoTzsb6XOhGyEMtUgbMiPYNqvEMW -swTDVmUDOtAvsq5bTSyIK1PoxFMwP7vINfS5nFnieML6xTSIJgHl1odKQ/LG4JRs -FMwf5SsWMwaVtrZMVfvMHokWNyY4alpiXGwGKvTLjX0L6L/4vYm71iVCRZMMR3ay -/aLb7g+enXf+pz4V7wIDAQABozYwNDAyBgNVHREEKzApghZmYWJyaWMtZHJpdmVy -LW5ldHdvcmsygglsb2NhbGhvc3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggIBALIb -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 -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/fabric-driver-network2-csr.pem b/weaver/core/relay/credentials/docker/fabric-driver-network2-csr.pem index 74280cd0a3..6b6c1c6cf2 100644 --- a/weaver/core/relay/credentials/docker/fabric-driver-network2-csr.pem +++ b/weaver/core/relay/credentials/docker/fabric-driver-network2-csr.pem @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIExTCCAq0CAQAwazELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEsDCCApgCAQAwazELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMR8wHQYDVQQD -DBZmYWJyaWMtZHJpdmVyLW5ldHdvcmsyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A -MIICCgKCAgEAp8adsb9XtRjnCJjRRF4e7TR81Px0TAoqGkgCUDK4oEybbMPIWhgz -RdDTkE9Ti5Lm1hS52qWodm1H7q3VClhpVQnBT9gCc84m/S1gQIS/Tm8bQQ02suAA -W16sSqRUK7fZv6jb3hjo74p9l0b0UN35nuq8SPvHxPYmdaXXbtWvXrwFV0oOIur1 -YXvfkQCDOMj/AFaklL7YdhkjsJv6m7EUSoZohSc6bB7gzUMxbwPWN2e6ko89PcB/ -tOxBiufn58N7lXHtMtmuqNdlRpGwyGW6KONp3DtJL8FM6vpBl33AoD3fn8W5eJ5P -swFoQI0gomhjYY8C4yJOZLJ5WWOpJ820U2ZX98zRWPfj7WQfkf3JrFapSZeHUG/4 -y9QSRvwKjWHD7aWgm/Oa/3IK0Yk9b8tnzeF1IvmTsPOyAxsPlIeU2vUhLAkoxmYQ -FCWPFm0M+V9LRXCxx8ewjtoivPcwt8pUDBe31Bf2tEhXVA85MnEkip53DrLYw4Xs -ms/p3OqbbFKE87G+lzoRshDLVIGzIj2DarxDFrMEw1ZlAzrQL7KuW00siCtT6MRT -MD+7yDX0uZxZ4njC+sU0iCYB5daHSkPyxuCUbBTMH+UrFjMGlba2TFX7zB6JFjcm -OGpaYlxsBir0y419C+i/+L2Ju9YlQkWTDEd2sv2i2+4Pnp13/qc+Fe8CAwEAAaAV -MBMGCSqGSIb3DQEJBzEGDARhYmNkMA0GCSqGSIb3DQEBCwUAA4ICAQAQWXz0aW31 -1vOH2TF3mMxnb+a2r2FnYsJrSbOtcZfkutQ9HK1b2nQ+o9pDlgvICEuOlp3zJK1/ -TJ6bvOop23pIehNPt9H8qMQueTG2r2BUYAcP3YFUUn5Bk6FUKqDKuMe6gCOsa/FB -apDbfbp0VwZ8ooHU9btH+lwsezyBHN/UPTAMRU0LtiATcQrtG/TSxXzQfMZfqJ1A -DjsIaDFTfqHCe1790BnkgK9gTkM8/Hx4CClaD8jn5fLrjV8IGzE4fw1eh1+5Q1D6 -PZUMdmKmcl41iqm8lye4jp0/vanP3/34Nkh2sXmPp2nC/m2+EiPBn0mp/pxcw6pX -Q0w8OKNdr44j9fwB6hbU1zfT0tgI9y+g8buATzufF59d5zx60mbmSu8tM4uPRWe8 -3VnnB0IzgJ6gOPZqFj97o4RJisngKtcS3KFQI9I/0fscOsWdz/yLXpTvNWOETjKP -TGduF173OsBhAqDiXGlCnuSAMMu4Jsomo+vv7AyrusDjnC3k0ZjpXR7FsyHN3G4N -iPIh1JEZE+GbRX4ErrpBxztF44Ejr6aMlMd4+7KqPG4YelnV3y/UgFFBplje+UUs -F5snb7UYxFn7kc2Z8gZI5oDiHeLbqG5VL5sLOYp5wyMkUSpGBVLwScd+M19EI6Vq -LsfhFa3vjE0yKTsQrRDxhVh8iLOibz1pmg== +DBZkcml2ZXItZmFicmljLW5ldHdvcmsyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A +MIICCgKCAgEA4Y7WdwBlfS5fSJWRlZ1FbxFEvkSPqaguzRwx3DGsknqisshwPoGn +GrPKh5G4otIsAy0Yx9g1ondDSMgkn2fiOlpo8ow5IuEvnXtSPNgWPj7HwdiHUlkT +8UKjdjf7qdQg6uVfsASWYhfEhtapOq3dr2/AY448cdGpHqHNBEoYOiwg2K2kkwgG +/o2VlF4ALUqvzmMBLRWgkeD4Nskb7lAZO1U2jVSoWqV8RmlM3oLbPNKGa6Z4psPA +fAauO14JjQPkqy0MWE5PbiI7hHPEhA6DeyBLniznhIQBbfwLrweGaaX3qSRMjvWa +6Y1Rv4uLQieG9v78hscCkAh7SVKO4wJO68E1/Zgwwj31mX3TAxt4GdJ/vrxu4voN +200+4mj1BmAhdUCGzigEa4c3cM+mBmOF5n6f4/y9Az2YzRKRPnnCq4MoWKA30eG1 +x1V1K/JDAzYVL63MrTYQfmx7AhOd0DAXcT/W9s1Pgs0iJQ0fZLv3UTtcrEvc/wyf +J5QSX3uGpxTnp170BNR6t8kVi4OJLDKaFLI8nMU9yvtnID77q0uRrS6ja2eG0KMD +sy3k3JL75sy7ncjNGaWlLUAodlbXsA/dl67LoBMvw9CH8e4gRTetcQ8QAdMCZ1Qp +G4giiL4OAvnv2+bCgsCgl8b7SjaJZ2nbuDQ4rkHjN5w0EPXdFfbkYk0CAwEAAaAA +MA0GCSqGSIb3DQEBCwUAA4ICAQATb+Rd7qaI4XlPaJ+ucdMI6gzBUbwTnI+1V5yG +WXoZKOIOinPTXtMND2UwdKMFZXalhQ9zIWHSIXDvO6z5kferOm2MBV1RHQsUW4o0 +JHQHhpRPCYUJ+sXdknPZlvakbG3JhDhxfoHp9uLgZ7UBrrDrMHLZgbqx89W4DYBb +Wpr5jQtQp7QfX415cAAd6ciAJIgHqniUbTzjvLZg0DTlKMMNIASoTi2z7/NNj2eb +b0cbYN448rDGRDR9mvoo6k0aw7XzzeJeYZi/7Y5C5HNqQN5oM9/ppFEZyFO4KzKR +1kYApFYMY/pk365q6IIrqmco/HKIx1sEj3HjeBy/e1pbi21+4qPo32p213mR0GQm +PjgkXgjydjpt2cn/ILSDTl5HJtYW3+4/z+nvDzHEqTJaRTlmO9t5ZkHK7+gY3XWR +LxSv4Q3VanYcfvxU6VFO4ebkfvikZielkQD1fVHDCdQFq5DUVIXpipeY5nGY3YZA +g7xfEG3UZvjvQNMt51ngKxkjyi3SfwH+mBfH/KvvPDqAgv9Sz3YWGJW9KxNj3WPZ +PxZCgz91VPHqK2+7Eo/QEWGzwW4fI9pzUy1WSmO3vM25PHEPyNP1ygpMRA/qMMfb +pBWBUQ52BoWU945UL0GsU6r3SOm883hhCW/VzCDIvYR5/zySLaHiNF9IbhXIFBrH +VcxX4A== -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/fabric-driver-network2-key.pem b/weaver/core/relay/credentials/docker/fabric-driver-network2-key.pem index fe5e21b5c3..a8ee64a7e1 100644 --- a/weaver/core/relay/credentials/docker/fabric-driver-network2-key.pem +++ b/weaver/core/relay/credentials/docker/fabric-driver-network2-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -xBGcmx8TIBQuZK6shCC4iExlsITw0lA= +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 +vpWeHfVdTtCmFPgBW5FkuZSC9BhxbYA= -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-cert.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-cert.pem new file mode 100644 index 0000000000..e0c76ed10a --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-cert.pem @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFkTCCA3mgAwIBAgIUPQuddNoq9wPRwyl2NzElogLNA3UwDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTcwNjU3MDRaFw0yOTA1MTcwNjU3MDRaMG8xCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEjMCEGA1UEAwwaaWluLWFnZW50LU9yZzFNU1AtbmV0d29yazEw +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDDm+sez0UHw+zO4hj9n8Ml +7DsH1s/hqQdMxNGbCYQVUSlSbeFsBvJGZmHCmEKvJFne7PsczVfT28wYlTBQb389 +k/5Ax2+hsveeayW6ZWCxdB4qTOf12KfT3nhhJLl4yPBomJkQEbmt1WyG2Fm9DkAx +hJoq2vDs+P5odFgwLx3tyVFCmQoqFmLEUcT4wCMVX5/6vRPYvNyRHuqYtuTcaOxG +m90X/vS9gVukfWhLvBY5qu27OBj9ilLAxWu5PGrzAMcLkS8iazgR3SSECrzPK245 +1+6dfPj2xlPr6EvyL9wFOr/k6iPn0/tk5k23MLWgwI9c3Bkxiv6Q+HrtTj5m9Gbw +SkmGvG1fIltbtRqdL8K5E7scoVQdnsBKhYL0QVP0b+mK0yg5RGSKqfzIznwnAz4f +UQREm/9IAhWjhZETqSJsYNXUKvzVWaUOlfSWttL5AcXANtCctKFwxogATHqLzUd9 +O5TrVUierGgvHUSGq3mKzMQ1Qr9HVjEyY3DSu+qzGmC/NyxH+KCyjnnr4trhp8s9 +CRbrqytrn6VxdC032NUIKNzg5tKTrUiWB2esOXQraor94yzyJZIOaX1UHs4E0TU5 +wxfI7ndUKJwyRNmE4SkhWQGHrkqj4G36JO079pO7igFf66AaQL7ZSzxmbzmpaiev +iPIz1d5Qu1gK7vjnaNZ07wIDAQABozowODA2BgNVHREELzAtghppaW4tYWdlbnQt +T3JnMU1TUC1uZXR3b3JrMYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUA +A4ICAQBkTNW5AMP9VZrdPq0H2AnMgqd+L3e+5PGyos19hwfHoYdQtC/UK+8FoPr+ +CuPsWn45YVduh1XbDkd5Kek+hXxZDR9SpJbx3dXcOu0GL7RZzSUH6JyQc252mJZ6 +4ZiaxazWU56kh1h3Khm0FG4EAA9pFGWLRP6/lPKJQThUcGOB9blwajiCm8o8aTG3 +WrvZqBktecWxf/vxcXceOta+A9ttPlCX/gM4Abm2LxJrmwUufrsPi8XtT9mKp0mk +UC6bI+WMdVsLmFkv4+CKGFCmzOVtPEASDY0UC8jUwgeyhiiH5LxZE4tYEkYq7NQL +0pLwZKEHIsWGw/QWjdRdcTD8GU1ewCTaI7dJxYLZlzmJf3fv9aTxlYYsZtO/aEG7 +1nEneX+NgIre8zVfPS9kTkKsNPZSflbcBgFQgsUOwDHGUv0HTdaSRTB0geXHf6/I +JLBU7HlvfxMs+4d+5FBjhhwFWK+hN1mP+Mkj9eqjrubbPfBSieTxiX6aF/bxjzKb +NxTmCHO8rsizZbxQa3kE063Y2h0ARmRJg4oQeaTnJJ2FStdhPxQ2xYCHAQ9OKzy7 +kCxOvBVMNUhrYZ46hc9SFM831C4FafuHN4a6JGTYQY06/AtIGlBif8sRCsoUGh/z +a4cr+N94cH5nyafMuV0bneoQ2AMYVct+OF9QH9j0GCzATCQh9A== +-----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-csr.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-csr.pem new file mode 100644 index 0000000000..8203b29b2b --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-csr.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEtDCCApwCAQAwbzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMSMwIQYDVQQD +DBppaW4tYWdlbnQtT3JnMU1TUC1uZXR3b3JrMTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAMOb6x7PRQfD7M7iGP2fwyXsOwfWz+GpB0zE0ZsJhBVRKVJt +4WwG8kZmYcKYQq8kWd7s+xzNV9PbzBiVMFBvfz2T/kDHb6Gy955rJbplYLF0HipM +5/XYp9PeeGEkuXjI8GiYmRARua3VbIbYWb0OQDGEmira8Oz4/mh0WDAvHe3JUUKZ +CioWYsRRxPjAIxVfn/q9E9i83JEe6pi25Nxo7Eab3Rf+9L2BW6R9aEu8Fjmq7bs4 +GP2KUsDFa7k8avMAxwuRLyJrOBHdJIQKvM8rbjnX7p18+PbGU+voS/Iv3AU6v+Tq +I+fT+2TmTbcwtaDAj1zcGTGK/pD4eu1OPmb0ZvBKSYa8bV8iW1u1Gp0vwrkTuxyh +VB2ewEqFgvRBU/Rv6YrTKDlEZIqp/MjOfCcDPh9RBESb/0gCFaOFkROpImxg1dQq +/NVZpQ6V9Ja20vkBxcA20Jy0oXDGiABMeovNR307lOtVSJ6saC8dRIareYrMxDVC +v0dWMTJjcNK76rMaYL83LEf4oLKOeevi2uGnyz0JFuurK2ufpXF0LTfY1Qgo3ODm +0pOtSJYHZ6w5dCtqiv3jLPIlkg5pfVQezgTRNTnDF8jud1QonDJE2YThKSFZAYeu +SqPgbfok7Tv2k7uKAV/roBpAvtlLPGZvOalqJ6+I8jPV3lC7WAru+Odo1nTvAgMB +AAGgADANBgkqhkiG9w0BAQsFAAOCAgEAENDV7nT8+AvLNgiUILoTGtPVH/a4ZyqL +L8YGGbeuFCcIdCWflC9vcS7/AhUTi0BeSsvceJFWmouSk5WPvfJOl5sM+JOg2axE +Vjw0AupFEF0Znm9kc6VNEDiYKSKEsweIPWdt5qII6UCbYpZh7pnxsi9lOQuDHf2I +Mkj1yxAYtRYM5jqsw9z0r+pShOjWYKkkXeSK50Xbl8eURkYHXLe7Qs1iKYArMt1S +oT5cS3IfsZUWOLwFXQeAyVc/uxC/lfOeTTJ7Rhx5hGfoiQSm+99Yn2HN6lbaUu8o +POSe89Jcr0oNNoXTNQIt5IhI890VuyiK4+9FsyC2e/vvr11FDvke3zK2YUWTSoVT +MUIC+k799AKfQsB4dAcXFGUkYogCj3CKubJVZCaWCMt9i8VBkdSIdI99q+TbEtWv +WGQK1Pdf013jDt0GyLjqPcunpTzsqsfZC5BdDUFHkUSbqOM809vSg9PQLW6AVHea +Y1ImhTaoK3mTqG/+thjWiPIALlcDqcS1AnzbTYGcptpV2CovfmOHwTBjK2MVkoOU +/3Ff6V+7dYdKA+YqBpRF6S9/xB5YyV6GwxIHl2Zbk7LocOzlqYVNxF5WeWT29FZX +5o/7fBVzuz4Z5rOgalL2PcvYL8hY1DDc76XltXCZ5WVyHX+qoOdh9797i4c1yZEP +m/2b5/PDURs= +-----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-key.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-key.pem new file mode 100644 index 0000000000..dcfe3ec5b0 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org1-key.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +ygp9qX1xb9RfKOJmQJpu5Jbhz+2jhoM8 +-----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-cert.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-cert.pem new file mode 100644 index 0000000000..f710a085c7 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-cert.pem @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFkTCCA3mgAwIBAgIUPQuddNoq9wPRwyl2NzElogLNA3kwDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTcxMTI3NTlaFw0yOTA1MTcxMTI3NTlaMG8xCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEjMCEGA1UEAwwaaWluLWFnZW50LU9yZzJNU1AtbmV0d29yazEw +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDPr3S5nxhNdez3NQ7w2Y1H +ZTaBgOub0g2wTVHQ0ss9ShMoPq0l6FHhoxIlaaMJC1A6mkaBqNvoWv1qgRZj3A/s +rAGddUVjL1YGWRAQmglah8vW2GwIvZFbDrA9xSHSG1a+KnxeqeW2Ku4Ca59cwu/f +2PZtF/HPQsvZQQDXXcHOgtksI1AO0ns9PS2N07Jv8fQ233yUK3HDHLn0qT9kf6hr +egzKybOWVHmwIoQxQeJZEunPI9svcU5L/fc6ornjMRly/WiRLL3QTFPBvmRbQB4i +ZAkCQpDrsdhCVby5XonLPkmxWVP3oECf7LHQO5x6NHot/OTBxEJWa184bWS2GXYC +l5sNfS1Hv2EONbMDiE7Ph0M9O++jtpJDMZNrKPEkvfY/6yod5I988bvZ3wDGHzbm +kYoai2swchhhllYnp0xl/G8STB2qfaveM/PNQJNCFpNHqWpu0OIhEzYX1fXuSC2X +T6T8jhpRXSSzLvxPjdlj3ddr5+7eMZGYB7lOyp5ZtwIjJH5BytVzJdePNXsluI1u +qNoHRod6qNPHYdeMoTwvJaZcBX07rJusqKq+S0CH54AujzqXyjHJTYmZQDQJzbhl +0wL4hTFkyoNeBSs6b+Z5WRh3bxY6RUbnnlH+DZrAFv8+O4tzc4K0TXtM2R8ZAFV/ +3tMzlP5UyZOMEhpjTGQ5BwIDAQABozowODA2BgNVHREELzAtghppaW4tYWdlbnQt +T3JnMk1TUC1uZXR3b3JrMYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUA +A4ICAQASt73nCHqcX/ySiwEAzv69cidm3pkqA6BCcxpQc0pcdV8/0NDEKVoWGMFs +z2MfVQkPN+vA5fkpV6MJiXnWNnbSLg7Yu+/55HwCCaS286vS+C/aE+OXfAzHVcfh +RUuEB5l15qZSrzOsbR7xfnR7c2zjz/gSUr2r92GnPHQZmbM42cfIkqDrkn/J3dbT +keacYN65JeeWHOzJ7me0Ro2IzjCfoS8CKd6WroIpraJ5nZamV/1xTgrW38dxqhP1 +O7Ao3NHZAKo/UKfnal7PejeWrrsJM3tEbyoS0KnpMr0UZJ99RF4DY9S9U/VVMHqZ +WcDzTlhX0Rv+oEnhBcb1sgKzP2IfPs0Pvxav0QRydDLqzxth+5e4nkZPj9jmumUD +daa1IIDMpj+e3dmw1UPUuKlWsJWNaOhq3+9OYJzDKtwShX5FNP/1EJplvaD62I+9 +nXD05Gcg1RIl81IxPnFBqAMpCdGq0AxDsbrvOYJ+LyUbNh/Rrx8rEAiy8AzOOpux +61RPDKh5ygbjjsmZ/YqQmVmcs9mfG1075IzzEvF80COFOvEDww7JphWQTnr6juTE +eXIa3M5oGFXIK9XhynPjcWweaDZbFfVtir0Bw14drRKgXC+NHxg8Jr/P3V7SdyX6 +veGrbsGSevdwGDskJ5SAIzgULnKwT5i/ePRjV1O1cdJh8KLkcg== +-----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-csr.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-csr.pem new file mode 100644 index 0000000000..c0c0440d12 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-csr.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEtDCCApwCAQAwbzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMSMwIQYDVQQD +DBppaW4tYWdlbnQtT3JnMk1TUC1uZXR3b3JrMTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBAM+vdLmfGE117Pc1DvDZjUdlNoGA65vSDbBNUdDSyz1KEyg+ +rSXoUeGjEiVpowkLUDqaRoGo2+ha/WqBFmPcD+ysAZ11RWMvVgZZEBCaCVqHy9bY +bAi9kVsOsD3FIdIbVr4qfF6p5bYq7gJrn1zC79/Y9m0X8c9Cy9lBANddwc6C2Swj +UA7Sez09LY3Tsm/x9DbffJQrccMcufSpP2R/qGt6DMrJs5ZUebAihDFB4lkS6c8j +2y9xTkv99zqiueMxGXL9aJEsvdBMU8G+ZFtAHiJkCQJCkOux2EJVvLleics+SbFZ +U/egQJ/ssdA7nHo0ei385MHEQlZrXzhtZLYZdgKXmw19LUe/YQ41swOITs+HQz07 +76O2kkMxk2so8SS99j/rKh3kj3zxu9nfAMYfNuaRihqLazByGGGWVienTGX8bxJM +Hap9q94z881Ak0IWk0epam7Q4iETNhfV9e5ILZdPpPyOGlFdJLMu/E+N2WPd12vn +7t4xkZgHuU7Knlm3AiMkfkHK1XMl1481eyW4jW6o2gdGh3qo08dh14yhPC8lplwF +fTusm6yoqr5LQIfngC6POpfKMclNiZlANAnNuGXTAviFMWTKg14FKzpv5nlZGHdv +FjpFRueeUf4NmsAW/z47i3NzgrRNe0zZHxkAVX/e0zOU/lTJk4wSGmNMZDkHAgMB +AAGgADANBgkqhkiG9w0BAQsFAAOCAgEAPDyz2K7mRy9Wb6Q98t3h9RC1mQ/56AGU +Fumzv7M4dl87DXiuMfDMg/Evx0ZErgG43U+0Vxb5DuWGtPX+nEUhFfpOCebwmlIU +kfjQv3S0CbmjVkosqLkGMAjP72GvsNQ01tysZ3WKxylZP1r4pZ6L9bQl3BRN0q+u +NEVoFW0o1Ny8EXjHfAE1WhZ5nddDISboMcb9IkpvCJiul8tqQfAktPCi5cN/QUg8 +N5pIv9rmc/WoZ37bDqSVE2RTlGs3rbaQ5jtL8uknLFzLTorJPBcsxADizQ/3Md0G +sclPT3NEwwMEozPdjvJVLai663FltDpyYs+uW9Zy9R+KzWlGh8VSqUGN268cVOi2 +U/GSD5O0D7hFubH3HrV5rBvSnbzPjl1Xh1PmDDLCZCmwyrRn5XElsUVqvHrgdf2W +CFI+/foNPOO+ndZSO3yH23zZ5d/1M5Ty7UDtwGlZP6xnuXvbmz6Bd1lj49iC/zFF +ymUJuWDpmjp0+ovnuIidQ7axkC2TDMgkwwN0t7X/IfGhIgimmPeuQeM/n0QDsSf+ +S0TyYTHF6PgiZkrNGQ2TQyeWO+EGgvvSg0lbF6cCzgNIZRG4Mr2LIHSrDan5YRdV +GUXR3mc1CXEz/rHZ+0XcuixE+iOjIQ8w5eGyY5oeEythYPQNXO+KuwrcrHuZMOwg +W4nXE9awvpg= +-----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-key.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-key.pem new file mode 100644 index 0000000000..937e08e227 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network1-org2-key.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +koxwIVVXcWndArD83w9y0cpGveDhkMk1 +-----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-cert.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-cert.pem new file mode 100644 index 0000000000..c03c4cac71 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-cert.pem @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFkTCCA3mgAwIBAgIUPQuddNoq9wPRwyl2NzElogLNA3gwDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTcxMTI2MjJaFw0yOTA1MTcxMTI2MjJaMG8xCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEjMCEGA1UEAwwaaWluLWFnZW50LU9yZzFNU1AtbmV0d29yazIw +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDVwuitAQDwXpY9H2GGRcQ5 +U4K/oCRom4fym/1QHqj8U6BklToXrUGNgKPb1xFbARGMQ4tBySoVColAwiKfo4i1 +WcSdG5ZwHYukPEKvPnvrZwKTSbElTyFdY9unGQ4NT5IN4fytiVlr4GG5SHsaWpU1 +H5NGHU9/U44NdQpcE8b+OGGKOTDshclD4R6CKqflKecTYNNfocTlQ/+U+V9r5JGl +sdS8geMHrrBCxbj/HQ0lEUgM9tJcdMmreLyUp2DK3CyAicMqGQYAEcj5piSEqJYr +Yhy3eYOY+Yiez4ecOSXe1rA3gBblLOLcKTWHjA4MSL4B1m+5ZuTClGXPx4MLASFB +0IzbaMFuRb1xU9i/lcgHwruioNMI0BcvvUlfZ8GrNCz7aVxbto+SvNA+6/XbnZ6h +hgjuZolX1weqz3qmGEubMS1zb2GkNYss/T5QJJ4PLRMMWeetyCtz1Y1IiHldv0gc +/dOsSuSDbrYGcd6AxJBh0yRvaW27Df6yhHi1YoX7wcqZyyDo9rskDOzhIoGawuOK +2Y19L6vnQZhtOP6t274sfE4cZydTKXvFyYe+37OdKuXWkrOkg2/hks3RUGeZinkU +iDQ5SB6dcrpSNuUDH9arOX5csoUHCewh6RrRvocqss56oDS/1xv2IyZdU3sH5d5A +4aD67zXYH3RVe2+uBMeEAQIDAQABozowODA2BgNVHREELzAtghppaW4tYWdlbnQt +T3JnMU1TUC1uZXR3b3JrMoIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUA +A4ICAQC6gS2nht0Ydd3ZsZfcobeLpYmx04YTHCLEBraPvqG59ZLH4uMHJd6LojFz +fGbQQTqbjP9QR8odRVnZvuvP6ljW1ym80UfvMGR18VxgDswvoa3he7FxXnQFfSx1 +i8G+8oC4zsrwkeq2LSMCSdv+XPe5R07xaGkz8f1MQlIxetOtBubFD59U3ZhjUPzc +9dvKR/Q7mo1HlK12ybqLTR639Lz3pGu7P3dQZ8bjQBBa0dfnCXce1r0ilwDdk/+u +U+Vebaw+9mKxHUrCVdmj16DqZlGxGGw61A6D1U4An9Or6FnX/e7SoORESFRZJXln +VXdejdPoJcZc9jabP7g7lOHytUkwUW2/bqD+RiYEmBxHeK/RXcb8HlN8rWWhKa/T +f33kqJHaG1DQd5MO3u9jYjU4Ic4WVUr/6l7NSjGSFWTSdSaZ1Fy0I9lJaU53oXGu +a2R2O7ZZwJFVI4TKF2UmtTj3hlxhoFk9L7XqIpbEhtWbRLgRQofQaOvkqaEiqzDn +qRnkxUcPHCQlK0020rU7lBJmJGQv0MrLQb/xgKqiaVy/EQ6vXK384xEyNjvmg1iu +W+QtphBb53FEU9RnXzBCE/Rfxb+XIpCxQM3fRAMujAYyERhwBD4Ncw3A5XYEi6tE +kba1KKRwEtdtRhCe8vhQYc+EKnEdiLE9XVpjD2bf4XcOAXd++g== +-----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-csr.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-csr.pem new file mode 100644 index 0000000000..b75c13faf8 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-csr.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEtDCCApwCAQAwbzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMSMwIQYDVQQD +DBppaW4tYWdlbnQtT3JnMU1TUC1uZXR3b3JrMjCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBANXC6K0BAPBelj0fYYZFxDlTgr+gJGibh/Kb/VAeqPxToGSV +OhetQY2Ao9vXEVsBEYxDi0HJKhUKiUDCIp+jiLVZxJ0blnAdi6Q8Qq8+e+tnApNJ +sSVPIV1j26cZDg1Pkg3h/K2JWWvgYblIexpalTUfk0YdT39Tjg11ClwTxv44YYo5 +MOyFyUPhHoIqp+Up5xNg01+hxOVD/5T5X2vkkaWx1LyB4weusELFuP8dDSURSAz2 +0lx0yat4vJSnYMrcLICJwyoZBgARyPmmJISolitiHLd5g5j5iJ7Ph5w5Jd7WsDeA +FuUs4twpNYeMDgxIvgHWb7lm5MKUZc/HgwsBIUHQjNtowW5FvXFT2L+VyAfCu6Kg +0wjQFy+9SV9nwas0LPtpXFu2j5K80D7r9dudnqGGCO5miVfXB6rPeqYYS5sxLXNv +YaQ1iyz9PlAkng8tEwxZ563IK3PVjUiIeV2/SBz906xK5INutgZx3oDEkGHTJG9p +bbsN/rKEeLVihfvBypnLIOj2uyQM7OEigZrC44rZjX0vq+dBmG04/q3bvix8Thxn +J1Mpe8XJh77fs50q5daSs6SDb+GSzdFQZ5mKeRSINDlIHp1yulI25QMf1qs5flyy +hQcJ7CHpGtG+hyqyznqgNL/XG/YjJl1Tewfl3kDhoPrvNdgfdFV7b64Ex4QBAgMB +AAGgADANBgkqhkiG9w0BAQsFAAOCAgEAZG+fY0UQ/NSCCvFwJSYLoECo9hKeKag7 +KARtTpT3bxW+lyGyHJJLcYTF89+UUdjpNIHL/mESzC0jGLe2Dv5z29jJpRpA71jx +Qqv8FUWxXouH/OI9npAk56W5HBgVjn2WJFAblMDs+MAWwaYqODky2beAcQHlWPEJ +zAh0THp13uu3otFSxA6QCs1PHLYzNpEqxJ7oufxaJ2lLDGT026irYLvtQ8emL7U/ +pWrNWmvRCKQ1qk3CvHsxFNJQBmFiau8avjEZPHhWvqg6+PkWFzr9eUnnh2w26jR4 +FJpJvlu3fnXamP7GxkELCQQiLKeJsLlMr9cKENMEUFng7x7hEJI23+GRaTk2K3yL +oOwHYvJldMLyj5RN3UCs24g+hJ7h4+FyMpVnd5TqzOm5mrTOA24GROjJqwYkfXbx +HpwTVZ+3tEu8j7vHzbejHpSabkEkUZjdjoxxYOxDS0DSbEEUstdrOHVSgvZbtcSj +n3fIItYJWJhN1lZVkUMya2RiYgTccYav8Q+GxL6L8pDn6+vwRSFNsEEhX/WKznLs +8qct6zN8bd+hTT0iTb33SBOVw0p0/JncSWwgAi4vTR9j3fGhetB7p/i1b4zjb+/e +EFEKlEA9DW1pbulIJIkIzTwTeLpYaA2mJzEAKlNONoJ460Eu24Tw6hCEQdxmyFcX +SCVl7KCzZD0= +-----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-key.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-key.pem new file mode 100644 index 0000000000..3b5b62a975 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org1-key.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +AeYqY4yH2tCxj1yMil6WL+bfdrjpcdY= +-----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-cert.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-cert.pem new file mode 100644 index 0000000000..39b040fc8b --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-cert.pem @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFkTCCA3mgAwIBAgIUPQuddNoq9wPRwyl2NzElogLNA3cwDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTcxMTIxNThaFw0yOTA1MTcxMTIxNThaMG8xCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEjMCEGA1UEAwwaaWluLWFnZW50LU9yZzJNU1AtbmV0d29yazIw +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCy80Qt9pRVdJDHVlQYrtey +XtgoZHdbGvbL9jEXxdThLUPBu76+fQXLbhg9IUCTjZfkiEIxQ8sjrFlCnkPgWAqJ +oIMPgrwcckut3VRUX49Z766Lrj7ouEkCmmHaD8x4Br/5lzxC+Mw/DonbDrt0F1bf +W+JolxDn5EXO2k9vJ9Go7R/v35VX/FOEdeaZwcAnw5L375HpBXUMoCLyIXKuyJQR +KjUHU3LeukXOEsWKc5syvdlvkG/0Qj75Wq3JlT8GWVvKaHj/quervA+cVYgWfMQR +Rj9Y8wBbrjkV3CgBxptL1+7bzhIzPQauSJi+BBHjwbSV0P3WcRoN6EEj3yElL6j+ +W5oU48jkxPe3qeJrDEsUnW28b5+pC5+gtxm594T5UqwOiLUMD2sglhvCGfShjgBJ +GxBvbpmyJQNEbTqYBxVFNwuwE+dgkFB79yIQ+80iHCyNptVbv6ImKmjzE3kEJu4k +QH0Ur/sEdtzmJAk5qrVERNTacUoHs1NUuhDKYm9Au9ZB+0dGc5ItTb3XuzdxhYig +CERK1sLLOvPx3+JY1WhYM0azOm5X71sWEY3OHWut76NtTkwuEOJTBDQoc47UOyTk +P0T2wcFCUhtZ5qcBjYI+CnCVF1XUHf+htojXxCX+ZzrZgh2Rry6sEfYr+4kfs/jh +7JydEhR8ZisWG72DJAi5rwIDAQABozowODA2BgNVHREELzAtghppaW4tYWdlbnQt +T3JnMk1TUC1uZXR3b3JrMoIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUA +A4ICAQCdYb1JKMNIJu5K/HQT0Q3WlEKsG+Kgb57knM3lIiGYzGGDhqEqxPFMDAng +aJUr3AgtwuTUHPZboAjM5pJUNVz/YHNoMGw/GgrLkUFEHzaUPTQSKeDRy16K344N +PC/JnjXK4Ntc5cQ69/ELXY62tSam5a6/+07eOyJfY/TJ266DLXVzDNZ3tTuk7LNg +RDlQLHPyBaCep+xA7BVio+J42Vu2OOmjBzJZ4lZ2nnbVUpP1m9urnQI6YlrifCvH +S3ZJZFAkBhZliXXRwpGMR9EjSDsF7/7B8+0BTEf5XDM+Y9HM7An3/vQr3VFCSTHD +e/qT+k4qQX5loW9CZUTKx3TKfw/lmowC3x1lWYWXhl4hqwW1PeQajmIDb1GBZ0/j +mHqhr4R7mITMHSn7tlKy7CGDUKgFjqSEnUnZkp9nNpUjc9F0MLssklHIFOw3LTMO +ZbGlZmf7DBlFH59ato7HLe15pGC0iXTqRk8i4UomutO0jKPZgfFkGxdXIUiIgWAi +6ILh75wGTnZOCDzA1G+WkwTTPTy/8/YMfxqBcyZih4yCf+sIPBrWLvSIWZr0Sf2Z +sWLD2I1+OB0HQPf4FTMoDD+dEQLuZ/2CCWdwickkFud+rs2YOzCrsi92wXdK52vc +04riP7ddkQPXXGhHGOKT82CVNjIm4pkh8lZOLNJSQkD9hPbs7g== +-----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-csr.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-csr.pem new file mode 100644 index 0000000000..abf7a27344 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-csr.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEtDCCApwCAQAwbzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMSMwIQYDVQQD +DBppaW4tYWdlbnQtT3JnMk1TUC1uZXR3b3JrMjCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBALLzRC32lFV0kMdWVBiu17Je2Chkd1sa9sv2MRfF1OEtQ8G7 +vr59BctuGD0hQJONl+SIQjFDyyOsWUKeQ+BYComggw+CvBxyS63dVFRfj1nvrouu +Pui4SQKaYdoPzHgGv/mXPEL4zD8OidsOu3QXVt9b4miXEOfkRc7aT28n0ajtH+/f +lVf8U4R15pnBwCfDkvfvkekFdQygIvIhcq7IlBEqNQdTct66Rc4SxYpzmzK92W+Q +b/RCPvlarcmVPwZZW8poeP+q56u8D5xViBZ8xBFGP1jzAFuuORXcKAHGm0vX7tvO +EjM9Bq5ImL4EEePBtJXQ/dZxGg3oQSPfISUvqP5bmhTjyOTE97ep4msMSxSdbbxv +n6kLn6C3Gbn3hPlSrA6ItQwPayCWG8IZ9KGOAEkbEG9umbIlA0RtOpgHFUU3C7AT +52CQUHv3IhD7zSIcLI2m1Vu/oiYqaPMTeQQm7iRAfRSv+wR23OYkCTmqtURE1Npx +SgezU1S6EMpib0C71kH7R0Zzki1Nvde7N3GFiKAIRErWwss68/Hf4ljVaFgzRrM6 +blfvWxYRjc4da63vo21OTC4Q4lMENChzjtQ7JOQ/RPbBwUJSG1nmpwGNgj4KcJUX +VdQd/6G2iNfEJf5nOtmCHZGvLqwR9iv7iR+z+OHsnJ0SFHxmKxYbvYMkCLmvAgMB +AAGgADANBgkqhkiG9w0BAQsFAAOCAgEAouSnol7onBKCfnPMctWeHjhFmOFA5zzq +Z8EmrLjNnIekUez73mAvcAW2G+oZAmnqOAY4mrZCBUJ6lE4Y8xAUGoS+JW4zdpUP +0hL0skBfvF/COEtNws8rUKwsjSr1rEljZJ/IKWaBPGmBwONBrpe4s3uvbPrEY5kB +k/nPPi6UOcwyxTuEl52y6E88NAb/aebEoIVvrmGOPWQfxuH3h2UsLQMzJCivXWcR +Js1vadvKkJev3SdNPq8YcRUf7Cpafrdxx5CSwqr5T1hWLWDrdjIIzuNDirAQq91O +5H8kPVZhwlcG72SRefF7kn+hK4enLVAHYkT1m9aV/rPNG+/al9c8jnwykHPiMMRI +9C0ptL9vI9AsuTdErMiMFqY2XW6z3DEJtCVWv67mlXP7vL+cikP7mmb7OH/ye4Dm +s6FKKXjEzjx7gYPdV9b1wJw0cWgMq4zpWWmRBgE7nSyCPULq+uX+s78f3E0EG6vB +gaAOmvFTKcpEn3gZ7q0a/cno/dmJp6VwfWigbNOL6n54ZIeGpI+mVpU7BrLuPtyd +QSXW3X4saJczjEos4F3yjt5F8V5BQR9e1zHkGLDbD3YJoigsg8vo2bJuYA6wgofd +JErKlnX2NiYjH0NKG+1SOjdPNj/vPRInUSMwsfxifZ0RTRm+dWSlgoPoKqBvq9sW +HOS3JRP3mg8= +-----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-key.pem b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-key.pem new file mode 100644 index 0000000000..9ec76e6b86 --- /dev/null +++ b/weaver/core/relay/credentials/docker/fabric-iin-agent-network2-org2-key.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +BGwkLkPNV5VXBOkdWEVhnR6dKL48rJ3H +-----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/relay-corda-cert.pem b/weaver/core/relay/credentials/docker/relay-corda-cert.pem index 6e082f28f7..bc5bc9ee04 100644 --- a/weaver/core/relay/credentials/docker/relay-corda-cert.pem +++ b/weaver/core/relay/credentials/docker/relay-corda-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFdDCCA1ygAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWE8wDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTEyMjAxODM1WhcNMjIxMTEyMjAxODM1WjBgMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxFDASBgNVBAMMC3JlbGF5LWNvcmRhMIICIjANBgkqhkiG9w0B -AQEFAAOCAg8AMIICCgKCAgEAqS9UV8fhYTmMSSGEnbB44sTCHDDmBc5pKW3iEwBz -IE2NkF61XXXPwz7omjCdO0ipt0XkOBSuzfa7NzAIpYeZVwMCJCFIv/9SJmt+tnmD -mGxHPusHWCf9tyG86b8KNprMRyowLxFylMKpalMMncDLjPDBYnkG0MaOrrZJ3/nI -q7izrQ9fwypAbwC7tSGgjzRlmnxDbO3MZeOmIGd7/o0xQz3sZtgrxoUblqip8J2V -xzN0g4QRO5QAV+Js+uWfSk+I1yVoWPMF4nOQrgPRbPRB6qJ436pEO/LisWHICizY -3ItHozwQxS869Gj5cNytyW4rCxXX7ivr9oVn/vceHXc0g1/M9vaYCSQg0kdA3LjZ -O4oLpr6avWBoTKWH0Wbm4KQnb91v9J7nniadBLuEHbeoScvpOo/5owODckyQX/+H -SSPeWEwWUb7C3Yuh28weEf+wY5utEdaL6tSb8WNWtu4dwhfBMYV4MkzepzDBAkO0 -qcADtEt3HBCxTgFoPNWFO0JMaCQbgAVEWHRGpynDKZ+oTpSUublQ3P+kduFAccRk -OLpnzVlWe3u7+pVzr+5U9Gc/YfxZDyKlU01MD5YOEwN0iAKHt6XAFKdZJDtrSNmC -r7SDfbS2QY4fgh8fbt8evHbutWY58tLPhaMf4VZNsQATmL9uK0xkHKXgYVUiHsyR -9RMCAwEAAaMrMCkwJwYDVR0RBCAwHoILcmVsYXktY29yZGGCCWxvY2FsaG9zdIcE -fwAAATANBgkqhkiG9w0BAQsFAAOCAgEABVYG3N+dsp+MA61hPgtlheDgPEzQvdw2 -zSnyYHW1K3e0h5eUAe8CWel25DTVMn2xlaBVdTC7UEbrJ6Ws0v+rC6YJFfpRigVJ -DjMfRejYN4D+VvcHQQjzPnboYkT5WxuUPWkgcHsYh+3SgVHSlXidTLcPAkvRJ2Ie -A/fD40AiJC6JIH8S/DLzPCkYATTBZqWFSqHGD+dAcv5fdkrU7sZ4iqMZkJoUcU8c -7EKC3Tk+VswZRADwzq7jvG8ZT+OoQmid9+EvyjxfITJkSmBAavVhJBiFiOifUAXo -jiaeyYn5yavpmOU5HhDBb+rVyzDOn0FN7ti1XXrXlq4nQpxTX3I2I2g69tOi5X+2 -qR72BWmrhidlAC9rOyjF+uMohX7tuBqvQfMfVCrrw30Zjc/wHXMNkjMHr1LMdHLD -DlC9wCLyX9XPjQzN81LoubjLiXpWSsFMnktIRPgojWP154/C/uNh8RZKPtDZiOrd -mAQALxfNmKOjnnsOyceAMhx7dWn2pDr6BucTWoNfjs3m7jl6XOym1Lpb9RnDJ3FF -6OSCTXBdqMVP/2unVLf3PuSd6N1Zid+6+P8bPk73Rr8qSE1tx3V9P6Gdu6kQe0vS -6Cv2QrBkBKT8Y2OOTep6KxVe/ZnPbF9F0BX9kNVI6Djk9TNbNhv3MfHi8xYqTNGT -F3NzmrpAYqA= +MIIFczCCA1ugAwIBAgIUZx1ScOCGybfU42DXPwVQfTJ2CoUwDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTcxMTM1MjlaFw0yOTA1MTcxMTM1MjlaMGAxCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEUMBIGA1UEAwwLcmVsYXktY29yZGEwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQDJ1EFqD+WDIlQw6jmgYr8uOcqmq3BPY7W2LWhmYlr4 +rnoWiVx0UBUnP/CJpp4CFdUHoIq8b4j2SniwzSU+z0BwZdEt6u02+p0XlszsdzdE +gv9eYGs0YWU2taQoJRXfxuOH63UsmR36hjX2usW2p3DdqfW+wlS4Y0rYOmGqkWZ4 +2FaJtn6/DP8awsgqDN0r46wZLAuN8fVto1gZ1fLH6lZZzfOepgv2uKltXMTSXUxK +ZWPIDCIfHc/hsHD0+pvCDwmZYoBLdOQiBZ8SLqpUfLvAng1S2TUtaU9qEdNQo5JM +O2U/w9Si9GBEeQ/xoQjcd6Ir0KSS72trfh3QaFYJQD6OdORiYBS5gzieudkM434E +aTEdl1HEcWU3hqW9YQPGtlW2Hd7DwqJXPYtmOr0rnjkVSPHstehswq5Zc5yxTe4i +RMmsGpEeSBEOcp2Vb0F3dp2hdL5VdWej5CtFKyT5oBSSWgQDxpCjnyRRIslxNoft +ED7VKcv6IJM+QqH8ewE3VuCgFVzd7tlbT1iJIdaOeUBXSu1lCCSqOq+Q3pj9oX9E +zND3nzmF5crkvcriNYoQMf1rhNeb0/zrGubZHOK14dTxpZkgJoH6hNVV5PZGQvSf +/qSU3L5XrxlMy+t4Ylqsugocd7K+e6fSNky5aAu6BbGkQb/+3+f1u+N3lGEGUZ0/ +2wIDAQABoyswKTAnBgNVHREEIDAeggtyZWxheS1jb3JkYYIJbG9jYWxob3N0hwR/ +AAABMA0GCSqGSIb3DQEBCwUAA4ICAQAoC+pmfXE3r/RuS+5gLte5W45SS0OoQ6tN +OToK+xwBHq1F9AR0Hd0kpJnzXE2Y9fuFjeM7ZczYWzXNSHLj6kBLvGomu5McDScj +rKAbrtN6rIxZEsHtWWw/9mx5RVcJLqChGklx0iflemy0Zw+/KK0QUh7v6RieWcV6 +Gs+GLIx3AcFa0JimM5xZi/nVgH/fVzRl9pkL4yK4k939qmjKubGChot1Gr1W7GiA +O/Je8C8cGD3wIAh/XZif8arfCgknUbn4wuaZs+X6dhykLplolb5XtyTaPAGRgLHO +/4cbw8ex7wiC0CVrNa3uflNPNSXDFhcmeveH6Vs0J2odXoe2mfgaCs02gv/izs96 +yDCZu7Ymn3uyZ6PrBUCRstVH5YT+5/H6HcrhtWxXvVFX20zVkOE6SyI1Akan56C3 +ZDNTYevCUM3OHwOExyb6XNMYnUV+eOtpRew37FgBoZS0Ye/NPGYlXchvRVQsYN3r +5Iyj8spMHhlROPhqXY7MP+3U6MVRbn6Qy9WdhnqeUPVH7+YHElXswgwI9pK9ZYyp +Hn1frSdNTjPE0FJR46tmL0U47h6K/UyDHWtv43yBz9xta636NmLsMSxV49mkXIpd +7UIGrddEeNoulIDhWAFNn632TVqDzsc3TsyReGT6CU15Z6rq0E+hWJXvaFqT9OOy +VMTiU+B1Cg== -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/relay-corda-csr.pem b/weaver/core/relay/credentials/docker/relay-corda-csr.pem index 962da2178c..af3a974d06 100644 --- a/weaver/core/relay/credentials/docker/relay-corda-csr.pem +++ b/weaver/core/relay/credentials/docker/relay-corda-csr.pem @@ -1,28 +1,27 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIEujCCAqICAQAwYDELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEpTCCAo0CAQAwYDELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMRQwEgYDVQQD -DAtyZWxheS1jb3JkYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKkv -VFfH4WE5jEkhhJ2weOLEwhww5gXOaSlt4hMAcyBNjZBetV11z8M+6JownTtIqbdF -5DgUrs32uzcwCKWHmVcDAiQhSL//UiZrfrZ5g5hsRz7rB1gn/bchvOm/CjaazEcq -MC8RcpTCqWpTDJ3Ay4zwwWJ5BtDGjq62Sd/5yKu4s60PX8MqQG8Au7UhoI80ZZp8 -Q2ztzGXjpiBne/6NMUM97GbYK8aFG5aoqfCdlcczdIOEETuUAFfibPrln0pPiNcl -aFjzBeJzkK4D0Wz0QeqieN+qRDvy4rFhyAos2NyLR6M8EMUvOvRo+XDcrcluKwsV -1+4r6/aFZ/73Hh13NINfzPb2mAkkINJHQNy42TuKC6a+mr1gaEylh9Fm5uCkJ2/d -b/Se554mnQS7hB23qEnL6TqP+aMDg3JMkF//h0kj3lhMFlG+wt2LodvMHhH/sGOb -rRHWi+rUm/FjVrbuHcIXwTGFeDJM3qcwwQJDtKnAA7RLdxwQsU4BaDzVhTtCTGgk -G4AFRFh0RqcpwymfqE6UlLm5UNz/pHbhQHHEZDi6Z81ZVnt7u/qVc6/uVPRnP2H8 -WQ8ipVNNTA+WDhMDdIgCh7elwBSnWSQ7a0jZgq+0g320tkGOH4IfH27fHrx27rVm -OfLSz4WjH+FWTbEAE5i/bitMZByl4GFVIh7MkfUTAgMBAAGgFTATBgkqhkiG9w0B -CQcxBgwEYWJjZDANBgkqhkiG9w0BAQsFAAOCAgEAi/lCxoaYvW9slIXF2wC0vFjk -PPYD4J2Y4BzVkR2NP3088URa3JeUfNwsi60PEX1q385OFinP4RbU2oOVGdbCn+OF -nz9zUKPw6mMIhGYs/CFNbLB1ExdrrinP0JN9CJQr+XZbgNJgsOz5eEraUD4OoEem -6W9tQk+rwKplF/EVm2hMUDr9NkumGebgESv91hbRCbEG/Z1aOo5i5kzICQGdbr9j -ggB3vCgir2DyeJegf0KzEWZY/i+53ZRIYKXYNbgSQQMwTfU7lKphcmyrfoMg8hDW -WZ/4Dtc7/TtP4ewFMgGrL45KPFrask8Q1wbGuO3v87Pukc+1zwiApXnRefJcdYkT -TtRagh8J87+Ad0FHxtKftEbqGsYkWG+Ty6i2YFy3eyfFIjrsQAzRSYGB9emJhvqQ -ZvLY1bfKS5D8GfOI0opB4txyuJu9aMk5J4X1/sUCzDrQ5/lSDuG8lIUrByvZz+qy -rLLjbqyO4aRdvK8vzwBmrj7k0qi/BuV1a5l72xDultS1/7gDDVR2FLb0cp6n3AdY -QyeA+l0uOA31rsHVATATJU1XjQXCp93SBPM/vWgtYvUmxKWaXV0NWLRVLb6Almyp -VF2W2aPIPTnwvdVwNHFqU1jwC9/LymFtg977x9OynhVMvoaN1v45NHL6naJwp7g6 -62tSsfJTTOQpM46FY4Q= +DAtyZWxheS1jb3JkYTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMnU +QWoP5YMiVDDqOaBivy45yqarcE9jtbYtaGZiWviuehaJXHRQFSc/8ImmngIV1Qeg +irxviPZKeLDNJT7PQHBl0S3q7Tb6nReWzOx3N0SC/15gazRhZTa1pCglFd/G44fr +dSyZHfqGNfa6xbancN2p9b7CVLhjStg6YaqRZnjYVom2fr8M/xrCyCoM3SvjrBks +C43x9W2jWBnV8sfqVlnN856mC/a4qW1cxNJdTEplY8gMIh8dz+GwcPT6m8IPCZli +gEt05CIFnxIuqlR8u8CeDVLZNS1pT2oR01Cjkkw7ZT/D1KL0YER5D/GhCNx3oivQ +pJLva2t+HdBoVglAPo505GJgFLmDOJ652QzjfgRpMR2XUcRxZTeGpb1hA8a2VbYd +3sPColc9i2Y6vSueORVI8ey16GzCrllznLFN7iJEyawakR5IEQ5ynZVvQXd2naF0 +vlV1Z6PkK0UrJPmgFJJaBAPGkKOfJFEiyXE2h+0QPtUpy/ogkz5Cofx7ATdW4KAV +XN3u2VtPWIkh1o55QFdK7WUIJKo6r5DemP2hf0TM0PefOYXlyuS9yuI1ihAx/WuE +15vT/Osa5tkc4rXh1PGlmSAmgfqE1VXk9kZC9J/+pJTcvlevGUzL63hiWqy6Chx3 +sr57p9I2TLloC7oFsaRBv/7f5/W743eUYQZRnT/bAgMBAAGgADANBgkqhkiG9w0B +AQsFAAOCAgEAMsgPPED9NDc44nyfXR/esc6Q4fV7ga0aBtxKKW6SngUE5Y6BmeoZ +68R4hbSn1fd1R7KtuEXyUKn+YVfbbsmaA/PwPA7HOcAqIY1t9smi2BDg7naLABwq +3nrpZeRAqinU2krqZOjflSMpl6l/WkMHaLzxs8ZXTnCZUwYr6dxOJkemdh+tgYZp +hUtfEgJEqfHgczZB78CqjuGMX25g6De/EkyEqXSMy8kh9d11ygXZ5BpVLqHFDlXo +dwFrBAVPZhALktptZjGc8CP6p5kVxXnsksvdEXyJGwsX6BdPsH/EZsUsDH0DnUF9 +FRATRr3TL5qt35rf5x0BN8lkETmCP+JEvH7xPgxXVlU2oZM1dwqqJLVkbMukPVR2 +0iwhEFD+6a0zxPkmB+8P1d9K4Jgey0JT3TtYXqnojVHI/AZhnfzfsXCa7Mztv7Mi +KVA+EANisNLor6EvvxpHSqH9P8tWouQnXA0w/OFM96VlT2Ekz93OlQl1GIweZvgy +ikfsFSNder7JHHPWi7RUjKKzCFGc1N/Us6qB1Q3veo9S1XpIwP1kmqdLq/GNYohD +KON+tDM5RDnDzzBc3jyB2H8lEcnnFvQFCu/w1Z0gQfs3PjBe67orL2FPtPpWRYNZ +WvEoBz21VI6n/ZhHV6VjwXH0y9htqMBumE3essyLnV5nL3KvX9aUL4w= -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/relay-corda-key.pem b/weaver/core/relay/credentials/docker/relay-corda-key.pem index 412c2ab996..77a4a4da67 100644 --- a/weaver/core/relay/credentials/docker/relay-corda-key.pem +++ b/weaver/core/relay/credentials/docker/relay-corda-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -ZKJnGrP0QSOOIYW5KCttug+mGm0QVA0= +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 +ItKK/hlUsOz48ragQ1Q32x5MoB+/urRP -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/relay-corda2-cert.pem b/weaver/core/relay/credentials/docker/relay-corda2-cert.pem index 7b49ca724b..d7399c4827 100644 --- a/weaver/core/relay/credentials/docker/relay-corda2-cert.pem +++ b/weaver/core/relay/credentials/docker/relay-corda2-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFdjCCA16gAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWFEwDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTIwMTQyNTU5WhcNMjIxMTIwMTQyNTU5WjBhMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxFTATBgNVBAMMDHJlbGF5LWNvcmRhMjCCAiIwDQYJKoZIhvcN -AQEBBQADggIPADCCAgoCggIBALwHHGOOAQybVo85Bl/5kdNT7OhnJjCFcK2VQm/c -bXwfHRyz0BJCWPSLJb1U0oapTl2Jht4TAUretgtSO9O2IMuPy3ZrvShIhTdaBhBR -tPkQoAO6jUqS+uLO4drJNgJ2VA5MnSStpV5IBeBK6kGIbOW2Nm77aAWwO+vmmOBb -4QB83/XfX5ODpgr1ntB37EUGwGb7YECuFptxbM7oTmLHCLV5GRN8VA12ER4tKrb8 -52Mq0XASrS25jiIyuRtw9aiHkkZL8I3u0C4pKNEbK2bWKAkjjtE3IZIZuJcOwZKW -L4JhYmC1JgJu2kD4TISEsTR5f9MR6qAoebJRP4NuIrca6fcwWMBSqKSq9RFEg2XW -iWe2kN4xBU7SmW3sytqm0BU4kGdzFDVCAPBqDPeB/NOWlnAA53dnnt6qpvcYQAll -GuGkqSI1/mRYTqas8mOQd7VxMWEisHvjLcOM8Ip6ROSJqJETSmr79E7dIY2SCnaS -EN1w8N0ohNkwGtsJgkieAyvLBDs3QxQGLSzg2iTH0hAMEnTOxPiFfjs9TMN6gBJD -rWVbh744eyWX3VNBwYUHErTrSpvlR9FvhhpX6aCi0iEBu4mHotvV+zSuoXfp40R+ -QBYmAd9mWucTrD0Gs+gHOsBCIl+xa0ozmKQEvNRtClKQ2wT88GawBe08dsf7gulu -6EXLAgMBAAGjLDAqMCgGA1UdEQQhMB+CDHJlbGF5LWNvcmRhMoIJbG9jYWxob3N0 -hwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQBaK460R/2nXaTbqaA5+5S5GxF1weip -8HvAj26VFXdMF48JiLfMci8O2nIkL6WdtY0W3fQzh9PLt5+RtqSWudPfxj2Alb/E -V25cifpMh8G4ExhasgTjRFzmYsaD/dXZ+ywTXY19kSRm8ZU66S0/1SfBvO31JV0T -WZWk6seNQSxK47vWdUkHhlGiUbbgJB7EE4KK7jhKE0nCm0PFt6ZTYzGtgdiuijk5 -ibHrjKxn/DHGLUIKLz1C+Ya11eaefc5EhUERLRuZzKFuNCmv+4FIbKFxP6uk9Usj -iMiW/lCyAZoUvpfV593jxExamxtCAgDoS1WefswnjVvrYpYOTM0V55mxaC3Q1jKN -M5gqM+Rr8flf3I61GVonN0mEAeZPZWVwCwmY8JSBgMF+58cBvO3hNztZbi7oF7OC -7d/rQD1Q6qRy1uMx8IR7ZEltJ/5yo5YedyVNZQNDlE/1PEf2eni1dBoXWFhjqlfC -79in9WNmwIMMPOMXL1u4l8UgIcmdZM5470lrM2TRK3MR4wuPi/cpO7ACX0ePpZ0e -pkirrDtao97wXKyThQyluKW+ipeaNaWzo/xis8k3xA0MTs9qOYmhfIj9PG7W3csb -ZeEjsuEVmIUuruDDNnuuFLNNk9QIayG1mZBZ+7bGNxAWFiqY5OCT0bLjIJQAzRJT -wqA8FakeioDp2Q== +MIIFdTCCA12gAwIBAgIUZx1ScOCGybfU42DXPwVQfTJ2CoYwDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTcxMTM5MjBaFw0yOTA1MTcxMTM5MjBaMGExCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEVMBMGA1UEAwwMcmVsYXktY29yZGEyMIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAyW7uwc33qFwctu8dB6BkynRShanBSwNpYk5LwWDP +37vSViBXBGDOCfDDjxvKtth0emHrdKVdsz/4iev/T6MyA2SIGBNqaBYJLq3PBHE5 +m6BkqK1oR8ul60UN/ic7pdhBQ2eBf+FiXw1MDFEV3oA9rSDcVDrJuJviVAqLkvIn +wEbUHk807zu3onDy2C1JDmVUdW3XLDbp8GHcL3q93HLIpKWPSNhiPfesOg7l5pw5 +FE7XVWiFs54+g2nnXq2qR9KGsooDRWA5grlXYPIUtD6/Cpz1eFD7RlxkbAA8lAud +3M49QnkqnwI6UtCBOPbbNBMacTG6BqnGxnnPStu6ra/42lDcMxXsbKRp+tmjpMJY +lPIYQEm7+FGTZnBCIo3QnZknDY4RvPtTHrkAp6TwrZnthp8iMWuJYd1pt7C42rVZ +rYwKiDQCrWPBAzuP+c7hzX9nq+bAMACS3BmHGUtlAHqnGsgrrth+lIIEKXc1/o/2 +dbMh1Tb4HU7SDsrLaup5dh+6s/SgnhrIRIAHAPifQG82WEHsOn45bbGo1i2aV10X +JGNN+hP3r5WeXzhJ8mZesrHodyVej4Es2sGd0y9AG3yh1kOZsIyXuJ/eKIxbSxtl +GrVQpQNw79yFVxnxinj7HuEWgseB9nxr9M9GVTwoIkxjRBBWFutNN88OR8a4LMd+ +up8CAwEAAaMsMCowKAYDVR0RBCEwH4IMcmVsYXktY29yZGEygglsb2NhbGhvc3SH +BH8AAAEwDQYJKoZIhvcNAQELBQADggIBAHPI41nGGVkriC2BZvX2g7tPQphbfiZE +NDwqA2FZrFU22dP92aaQ0pZsOY9Xe7K3pY5YWkrutae7/xeZrtreUVwQ2fHuFsUj +jYWHRSVv5JXFMey6nfZA8/a7LyVLFxMROCK9pKlGWbAz89KxgL7mXgdqN7wiSpBR +2I8JMBtv/AuSCbh3jbJ5vdHnaLuaNN7+sogTWVtAqfAyZQu8aLEOpwjlRAxxLUs6 +We0IYXtF7ELvnwlyXjX5W7jQ8jnd3xCwrO3WClz+kDnrnW9A9ThQhHXRZ5bpMbet +1hJ3YQXCSdNqmX7acwYxKVHb33Q7oUDExNO4ghWZiZCrlBqA51qhVM40IVS52pxC +hJfNQfM093bKt42ALCSsWI12asfvNxEEEn/aAIeFZFrThtVw4JQo+7Bz24K1Qtp+ +PzGlzraUA0Iax+KwT2bdi2CkbsdulxPBU8eOSSjQCkoD5naY/sdddMzUw62atpKP +CF82/XjPerDgErNyBKAFYwtNtHAgy4yMc763XjTi2ZZfP41P6RbCGKkHAPXNHwku +TcGjMTSHrVZ8PRsDwX0ib9eQZVbZu1RBUoo/0OMZfCu7t9N48u98RpgXS4P5rWDv +gE+dg/rw/FDkRlwBEohkxy3bn8mGfQoVj+IzZs8kOmZ0QbgbRFCNdcjI8Zzw7UeJ +6giiupWiPpS7 -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/relay-corda2-csr.pem b/weaver/core/relay/credentials/docker/relay-corda2-csr.pem index 338bca8d19..6e0f284f07 100644 --- a/weaver/core/relay/credentials/docker/relay-corda2-csr.pem +++ b/weaver/core/relay/credentials/docker/relay-corda2-csr.pem @@ -1,28 +1,27 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIEuzCCAqMCAQAwYTELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEpjCCAo4CAQAwYTELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMRUwEwYDVQQD -DAxyZWxheS1jb3JkYTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC8 -BxxjjgEMm1aPOQZf+ZHTU+zoZyYwhXCtlUJv3G18Hx0cs9ASQlj0iyW9VNKGqU5d -iYbeEwFK3rYLUjvTtiDLj8t2a70oSIU3WgYQUbT5EKADuo1KkvrizuHayTYCdlQO -TJ0kraVeSAXgSupBiGzltjZu+2gFsDvr5pjgW+EAfN/131+Tg6YK9Z7Qd+xFBsBm -+2BArhabcWzO6E5ixwi1eRkTfFQNdhEeLSq2/OdjKtFwEq0tuY4iMrkbcPWoh5JG -S/CN7tAuKSjRGytm1igJI47RNyGSGbiXDsGSli+CYWJgtSYCbtpA+EyEhLE0eX/T -EeqgKHmyUT+DbiK3Gun3MFjAUqikqvURRINl1olntpDeMQVO0plt7MraptAVOJBn -cxQ1QgDwagz3gfzTlpZwAOd3Z57eqqb3GEAJZRrhpKkiNf5kWE6mrPJjkHe1cTFh -IrB74y3DjPCKekTkiaiRE0pq+/RO3SGNkgp2khDdcPDdKITZMBrbCYJIngMrywQ7 -N0MUBi0s4Nokx9IQDBJ0zsT4hX47PUzDeoASQ61lW4e+OHsll91TQcGFBxK060qb -5UfRb4YaV+mgotIhAbuJh6Lb1fs0rqF36eNEfkAWJgHfZlrnE6w9BrPoBzrAQiJf -sWtKM5ikBLzUbQpSkNsE/PBmsAXtPHbH+4LpbuhFywIDAQABoBUwEwYJKoZIhvcN -AQkHMQYMBGFiY2QwDQYJKoZIhvcNAQELBQADggIBAJqNhXCZj7Cm+bMou/gdQJWi -y3cYiM8xsXRvVJomXHJw0MHFc9E9XP/9dPZpsxoYz5/XimelLrQpVIURyUAWUSv/ -rJcfvlpZ5BcJYnD86in8gumowp2PVTYnGdWRYufvcWKxJstb2pzVXHbAHMk4Xj+L -bBCnffTtw5kdQEa0vWjMvkkF7KQizfqsMRzGRCofcTdhFX1e7bFiQq/53+KWgnQu -8x3I4M0ohtgVEXSQrLT0N7t3GsKoz3/q7G6B7BVS+dMLY0JL+kiNBqhtwGC/eAQI -bAoGYP2QQ1txf0AzajcYEb024MAcmmxV8F26J/JR/rF6jOSkxTd05przukNeoI8j -D67/wrtPwoAZCzeoSJCi6DfRdfe3Lec6i03QAME62ZrUhWadtyQZtndSY2O1TEad -Gxxz6DZQkGENx1bTTS58DeDfG8EHX978J92qyK/zfRBR3LxIHfyB0Ots4SRF+3BT -ZCjcic2zslNn3I2hSSTZyfySaPKiiiIgubxTVh2PCQyCz9C7I5G51eKfkTqMvcjj -yW5mM8rAeHEFwpNtCPZVOFHJdtnn3yOYCmbuLQOsnEw3+mD3Q/D27pxX2gusPir3 -O4jt/2R4ePQZuPVlNUYobTJ4yutXZq1YUs3xi5PXBmfY9kIMUV4d7kZZigpBvKq2 -M7UMajsJJ4Q+b7u+ZHtc +DAxyZWxheS1jb3JkYTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ +bu7BzfeoXBy27x0HoGTKdFKFqcFLA2liTkvBYM/fu9JWIFcEYM4J8MOPG8q22HR6 +Yet0pV2zP/iJ6/9PozIDZIgYE2poFgkurc8EcTmboGSorWhHy6XrRQ3+Jzul2EFD +Z4F/4WJfDUwMURXegD2tINxUOsm4m+JUCouS8ifARtQeTzTvO7eicPLYLUkOZVR1 +bdcsNunwYdwver3ccsikpY9I2GI996w6DuXmnDkUTtdVaIWznj6DaederapH0oay +igNFYDmCuVdg8hS0Pr8KnPV4UPtGXGRsADyUC53czj1CeSqfAjpS0IE49ts0Expx +MboGqcbGec9K27qtr/jaUNwzFexspGn62aOkwliU8hhASbv4UZNmcEIijdCdmScN +jhG8+1MeuQCnpPCtme2GnyIxa4lh3Wm3sLjatVmtjAqINAKtY8EDO4/5zuHNf2er +5sAwAJLcGYcZS2UAeqcayCuu2H6UggQpdzX+j/Z1syHVNvgdTtIOystq6nl2H7qz +9KCeGshEgAcA+J9AbzZYQew6fjltsajWLZpXXRckY036E/evlZ5fOEnyZl6yseh3 +JV6PgSzawZ3TL0AbfKHWQ5mwjJe4n94ojFtLG2UatVClA3Dv3IVXGfGKePse4RaC +x4H2fGv0z0ZVPCgiTGNEEFYW6003zw5Hxrgsx366nwIDAQABoAAwDQYJKoZIhvcN +AQELBQADggIBAIsBpjSArk3KZFVjsiqlLNddqJTqTqgreZtxBLPknVvntcGMKEJk +dUozf1KUnf1xh+ZKyWQrDoAs5uzuWZxtjBbk1t5OYCPUEKlXBwVgDHpl0LRYEP0U +WPTDQCQdGcug126dQ5f5MiX84uZMzSb6gJZfp80tM9Zokff96tAjnzn8+uMG8VJS +ivLre0ynhdeTlPV2og8MD/96J5LAM9QVDes/aCEOXDzuNm6OOohb9z7MJcn2EawC +HxuERD1NuQCghdiDWmG8O34t0SjU+hJ8KlcInJuqcc81bNOxsr94OLeanoPwVWOu +6zVD6BwAaA0+BYXGTuctw2QzeDHXVe/XwjfFNcYmFpfs52JXVxlokt359JURj/Hc +5EquRAz5i3tDEO6MQxLlHKYksswUrHbLtQoh8oF+As7Uy5AOH+s2gFDvhVolqjVm +6VnISBvXQ4uTErYC4DNmtpKlf3JpmHFvxNZoAHbuxjHToje4rzpNv2jlDjy4qDxa +W+2LRMn7p3LI6JvpNcufVW4lOBJduz3tNcXjlbdJkwmKynZZLFzJTQU3vU5phDyA +kQxQEkCwf+FqNHGn8a9zZBk4nQwPgQtK6zyhIVh3/PWEd/gfFEdMZevDsU3lh0p/ +VISBnykDo1kewwdC14Y40YA4vWLd/N4KPxedzluPu9wjyeBnx2iv0jce -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/relay-corda2-key.pem b/weaver/core/relay/credentials/docker/relay-corda2-key.pem index cdbebfe95f..83b948c465 100644 --- a/weaver/core/relay/credentials/docker/relay-corda2-key.pem +++ b/weaver/core/relay/credentials/docker/relay-corda2-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -szjPjqmZduzqJoOWhe13qUbQP9niaQ== +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 +6NvTX32qk9PYHBabmW8ClJU3247l325Zpw== -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/relay-network1-cert.pem b/weaver/core/relay/credentials/docker/relay-network1-cert.pem index 64de887549..27ec27fdcf 100644 --- a/weaver/core/relay/credentials/docker/relay-network1-cert.pem +++ b/weaver/core/relay/credentials/docker/relay-network1-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFejCCA2KgAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWEswDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTExMjAzODA1WhcNMjIxMTExMjAzODA1WjBjMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxFzAVBgNVBAMMDnJlbGF5LW5ldHdvcmsxMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAtQFMYoi0mfB0U8Cey3hBYAapipt9HlKz2Mg7 -svg9uFzbod5uMA7/og6NTHW0y8X+blRY9ol9UZ47TdPtmnBnV4JuCOuN/sUAbSlD -eL64ayWjaZ+TYNy+oLNBD7O2t3WEn+cSu7rM1mnd7XBKnBjN7eKfCyoPEDwXwNpK -rvwefjtXHGwLs0Hh5mak0Z6puXhsUHRwkoIx+7zCuPvxDlnU19/XXL7mXoXouiA9 -ppvBHy3ZQheUzqdHsd6lL9oPFi/lJ6OW2FVt6K28yfOunjwcYq8JVcLHqCgGqmH+ -PQnxdCI8uVnUSMbOeyMHP1uTq9vb5xLPOMBn+3XRbGxb5R9eqPOXHd5P1vOq2r/D -JDtIrC8mztS7/Kh3I2YKGhnEW/QU8aT/FOJM0QnFA6Mbkqcd4RcYSXDjT42Q+w2w -F4piwE/vxhSmR18RSRyDuRrXktFvBtwiOv8gJ0TbdQjm+4acwUygzEV5g6BNhUrY -cTT0ndeVvFZHpwFHBKaddgPx7TEcdNdy/O/HxfOxfcYY1Ouh7zUB8C6Hf+qzommW -VAAJVrafMjMbdKUGyZ9WJuCEiv4EvUlmbuJMPwMtASGkY414hce0AQAOm4BwpMFF -5jQma3K6KRlikGwUCD9qVqlB6Wt1CyA2ZO51WvP66DuI75/sey6Bb9WeyJLMMJ5B -1GyClSMCAwEAAaMuMCwwKgYDVR0RBCMwIYIOcmVsYXktbmV0d29yazGCCWxvY2Fs -aG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAIkS9pr9jMZ8KYf2wPXgZQfkg -QRUh5Mb+uz0wYO3+tFi77SO/OiM63bTU/L0pOvyboDG5AiUVi54POtbbEC35S+6p -4UkfjvKg6NxNNKuGmtSSqrT3WDOEuedc9wcfJ6sRrWXWLpectNRIRN2eHtQ5XYuQ -q+jWXRJsDUksKk1P9OU0WJ2vI9aIFbQ95lvPTOdrlTDwO0eIRQxP0QrDEGQjFZBj -xZThrMi4wnKl+/hXNF9wfVI0hCJgWNdB03q9tDnXKwp9is/tTWT6/3FM0uaTWu3S -AKirveug0L1pO607iScs7eDa6iyztNDRVmU/l03td4zax1D8OPfOZZhzg3cuW7mk -5p021ZEkuFwzkVurF40C3hNrt3A/2Tf1eWFrbGl5lDucDG3Gc5bTR52j6RAmUV1/ -+BglOnGbeUzlDEUFUiKTTu3NhFx/RHqQOBnWTh5DbXWjP2xhZpOK4m8Y/trs9E+8 -WtS9xZdN4Bj4hzmCYDlEExA503b+4lw7brmejXuxzFdEbQQExpKMtm88ldNTwQGh -pmTC/48e1bkhP2UBq6xnWEBv2LDq3nicm1XyVWftaz5aSrWIPIIDXY+JcymWd1dH -mW/hoLB3AR7rqkfUicdPbLO+0iboFzEzpfiYznUHVQ4i/uUkdbZuILygCrJaYeKT -x3+5ZyH4vT/O3DPt+nQ= +MIIFeTCCA2GgAwIBAgIUPQuddNoq9wPRwyl2NzElogLNA28wDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTUyMDEzMDFaFw0yOTA1MTUyMDEzMDFaMGMxCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEXMBUGA1UEAwwOcmVsYXktbmV0d29yazEwggIiMA0GCSqGSIb3 +DQEBAQUAA4ICDwAwggIKAoICAQCpNmz63QVUzqiEhXlWf/2nsE8ivuzTwlDYDatG +8KhUSYRrF/zp70zUH2RflcrCX7IKPQx4aWAQojeiYUzISey4fA6ENtIBHWVrqnqJ +1Gyf/rvidpDA2tBEVY6DS2M87WebiMjo9Vjh2104nomwPDZ4iM/IIUmy6PAeQ74L +bZ17xE4V8UYRw7m/Fywr7wnQ5NDezYEPb4FXvYCuMiwn+NmDq3huybGoNjJAOIh9 +HjTeAzhrxQN8BxlbgzhvDbDEUq+xUiPaKuL1NaDCBs7qiDjqzLXh2qqWbkYLQ2TS +vUDjMbfIeRFGC4A9aLCPduh6gkAaR5ykGoIUIyEze6Rn8jIKCOuSgXnxhuS6NG8N +VAwvfPbnupKwhl61sMkHUOsPFPT7UG/d1FKCMh6m+jq1hlZAPNIZJFKS2BlIf0/e +nftdlK3R9c760FlDoDBQDEcz9mZ3m/W35nWuxHff9vVO2jmKzvw5KHCISUMiomPD +DN6Y9ofWGVd7tv6X4eXQ8m3xbwWWEejboMJnHTdhYAddbO9NHmBp5QtfMcT7YDMW +UPe9XkKBTlovVs7PCQiAgde3LXNbyWkW+yQQtXtSWSbfTO9/9a+VerCp/h1JGc0k +SWAcCUkRHc7W3rZdJaEThj0gyE2klmZ5nx1GfwbV09isXKw6hN7rX5HJY4w2NArs +8+pyTQIDAQABoy4wLDAqBgNVHREEIzAhgg5yZWxheS1uZXR3b3JrMYIJbG9jYWxo +b3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQAtybTy+3UH3JNkXzLuN0KuvmCV +sh+tVcZZU8OigKjUF4EqoRKTIkldGSPBV50Fii0nokF7WSpeafU/BFKiQKRRKHGm +8OW5L7cmKj7Qr/FulXqV606ttEnlOEuMG/KZwE5Ng/mjJklJVVVIdJHwdcKQvy0W +SNmmutsIS6JT96HZWDPlMn6WAfwkzmkWFiq+nJ2PqRx5gTS0hXD/bAgLl00U7//a +Fgsdty3uZNZkhWF6t2CYftn7fDznJ8VTx6MgqmmuAzE/0km4YnN/1hQdgNBiXT4O +zfNEolUU1pfGmYjTvB89oFDqD+SoGLtLd6nPisMVY3sg2e9tuSPYazqmLu32zABe +wXv8tmOn8R6j2x2qp/z7QIbIZmhjqmmOKZR4Ao4+akvM9vhM/UwOQ0YgzvHo17LB +ZBitDzAKXR7cWn+O/LX/922hh3atwUHw/9H8Ufw5Ftvyv0qmcZOxqid1qkxflKQ6 +lGNVbcTd3kzAk7EbgUfNBy5KC6OuytDeZh2DbpA5/6/A1qt3wXjNxfaNPGnOJhGn +ngLJlMALFCPshCYedkcUJ0Y/xIeKZ+NYWAjGlmQFW0HsUuk7WwJ/TcCznGNXcDQL +A2Z2MzaAc3A6aj5SR1qWYJAUltOS8ZM9rK6CpND0d1tIhp3jLaagit9LOHggLEcx +sCalXjZJfIZgicXxrQ== -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/relay-network1-csr.pem b/weaver/core/relay/credentials/docker/relay-network1-csr.pem index 7a27d08c9b..19aae03a84 100644 --- a/weaver/core/relay/credentials/docker/relay-network1-csr.pem +++ b/weaver/core/relay/credentials/docker/relay-network1-csr.pem @@ -1,29 +1,27 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIE6jCCAtICAQAwYzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEqDCCApACAQAwYzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMRcwFQYDVQQD DA5yZWxheS1uZXR3b3JrMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB -ALUBTGKItJnwdFPAnst4QWAGqYqbfR5Ss9jIO7L4Pbhc26HebjAO/6IOjUx1tMvF -/m5UWPaJfVGeO03T7ZpwZ1eCbgjrjf7FAG0pQ3i+uGslo2mfk2DcvqCzQQ+ztrd1 -hJ/nEru6zNZp3e1wSpwYze3inwsqDxA8F8DaSq78Hn47VxxsC7NB4eZmpNGeqbl4 -bFB0cJKCMfu8wrj78Q5Z1Nff11y+5l6F6LogPaabwR8t2UIXlM6nR7HepS/aDxYv -5SejlthVbeitvMnzrp48HGKvCVXCx6goBqph/j0J8XQiPLlZ1EjGznsjBz9bk6vb -2+cSzzjAZ/t10WxsW+UfXqjzlx3eT9bzqtq/wyQ7SKwvJs7Uu/yodyNmChoZxFv0 -FPGk/xTiTNEJxQOjG5KnHeEXGElw40+NkPsNsBeKYsBP78YUpkdfEUkcg7ka15LR -bwbcIjr/ICdE23UI5vuGnMFMoMxFeYOgTYVK2HE09J3XlbxWR6cBRwSmnXYD8e0x -HHTXcvzvx8XzsX3GGNTroe81AfAuh3/qs6JpllQACVa2nzIzG3SlBsmfVibghIr+ -BL1JZm7iTD8DLQEhpGONeIXHtAEADpuAcKTBReY0JmtyuikZYpBsFAg/alapQelr -dQsgNmTudVrz+ug7iO+f7HsugW/VnsiSzDCeQdRsgpUjAgMBAAGgQjATBgkqhkiG -9w0BCQcxBgwEYWJjZDArBgkqhkiG9w0BCQ4xHjAcMBoGA1UdEQQTMBGCCWxvY2Fs -aG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAoLQUiWBUuxdnm2ELJhed8bEr -fQBnrLDgFN+DnA1GZ5wYPT4O/Pi3OTz6cVM9YtSK+ytZhBClUgDq0XbwSXA93txI -TtYpn6kdkDtZpbFv2hiDOsEx+lk0gkgao213pHa8jkNemPfpEfV2n5xdr+VQIHWN -619cic6Y2FWvAQrraQq0u0hDRwIh3VvBshYTWlyrKoXTGWCE1PCMU+NsSPPfhm40 -Nv2zjx9rmrer+nlhJ36/FgzxjedWBXAEqaXUFZyaeJr8cWEp6z6k6OxUfjVbbsvH -t1B3FsrriwFdAC6oN+gnBsjGrtbqfkSm9cnyGh+IJd1ZskQrct/NrycmWGpN6qvT -PcyOyZcFXZBAJu9anE5Iyf9+Ewv9TPYfhW+Y1y2L64K8DEFRGBkTCAs1a/WZTqe7 -/ODPrOpiK7gQCvMHuBM2Ssh+X04qtmGi0o15QcCLo0kUqysEQbxcISqRrlzK7DfG -HXUOQa+kIygbdA+a0hI3tBqg9MU513Ffl36awYeBzhPmMb1PxxLMVgovB1xE3AIM -jSFjLhQxdTYgF9s+RFbBtwnSXxrVQnhf9NCo+jhBLhAQ7IXu9YcqMZZQ9E3Vh5YZ -w41UwvvFREjmbYsrRgtWHZ8Ejwks+uf9UbxOXG0A7evhUfzZi8obVjzhtMa/34Ix -Wf+9sd3MLM9cuJHDCc4= +AKk2bPrdBVTOqISFeVZ//aewTyK+7NPCUNgNq0bwqFRJhGsX/OnvTNQfZF+VysJf +sgo9DHhpYBCiN6JhTMhJ7Lh8DoQ20gEdZWuqeonUbJ/+u+J2kMDa0ERVjoNLYzzt +Z5uIyOj1WOHbXTieibA8NniIz8ghSbLo8B5DvgttnXvEThXxRhHDub8XLCvvCdDk +0N7NgQ9vgVe9gK4yLCf42YOreG7Jsag2MkA4iH0eNN4DOGvFA3wHGVuDOG8NsMRS +r7FSI9oq4vU1oMIGzuqIOOrMteHaqpZuRgtDZNK9QOMxt8h5EUYLgD1osI926HqC +QBpHnKQaghQjITN7pGfyMgoI65KBefGG5Lo0bw1UDC989ue6krCGXrWwyQdQ6w8U +9PtQb93UUoIyHqb6OrWGVkA80hkkUpLYGUh/T96d+12UrdH1zvrQWUOgMFAMRzP2 +Zneb9bfmda7Ed9/29U7aOYrO/DkocIhJQyKiY8MM3pj2h9YZV3u2/pfh5dDybfFv +BZYR6NugwmcdN2FgB11s700eYGnlC18xxPtgMxZQ971eQoFOWi9Wzs8JCICB17ct +c1vJaRb7JBC1e1JZJt9M73/1r5V6sKn+HUkZzSRJYBwJSREdztbetl0loROGPSDI +TaSWZnmfHUZ/BtXT2KxcrDqE3utfkcljjDY0Cuzz6nJNAgMBAAGgADANBgkqhkiG +9w0BAQsFAAOCAgEAUkpvcjS8Ilpip005w4aKIiV8PXw75Pr37Nc8PoAIymNBg7r6 +gR1bqiTI+dlc2c5Y4ecyOHrcligIx8JFduLwywMdiVFu23e651/GhD1ZgGPRssty +CGkcKfgQXoBOr0MF68Lgbjuwzwzh9yReoqOzqQOZGw0jPxoetWsIbdTTcV2g1RI1 +lHaJxE+d8VWqrUNvob7x/QTw5VRXpuFhMP0q9fuFW8hmcen2RNCNI9puwweHPRWm +3ujg+Lzj8zvEd50sihJ2MI++Hd5WL0rcWxKvyEwfdmGTF1sywif45fSIbokKfvjL +sP6LL8EWRadXSEXsJigt66/WO9DUPJdmbmXUYUcQrs2R0Odib/i75WF/SBvGJg4u +lQSOlvDcddzVePJBHb7btVxN2cmLrK27kWAV93qRVf4BAaHfZ8cJBQRNTikZhNeS +gnMgmKJlPbS6aUah/mVrZfRTKLh0aNem/3WEIvxB+3BZSmKUdGGxi/vMd4Q9GvSK +KAH4kC6JXP37kjIgxKATvsA2hevWDN3yiHOnK4eN9wB2vd4weL4aFPKLPP75GzQA ++aSuZlvApVvEMGy+l1gCfNY2vYkz8vRrv90FggZyJSiS72NTKeLzf5cxnBRYI/39 +vChE+Qv8xdfu9YWiRNpA9yXksB73YcmKH9n5UzNpXwLwFtgqaQw54zaMwVs= -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/relay-network1-key.pem b/weaver/core/relay/credentials/docker/relay-network1-key.pem index a0e6d3420e..adaa94d891 100644 --- a/weaver/core/relay/credentials/docker/relay-network1-key.pem +++ b/weaver/core/relay/credentials/docker/relay-network1-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -ivVcTPUAprbtwux6xNQtIns/HKfgx50= +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 +iCzOXyZTrIVPoboJXuOjgPe+d5tzYQ== -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/relay-network2-cert.pem b/weaver/core/relay/credentials/docker/relay-network2-cert.pem index 1612e7f8f6..0d7d46eefb 100644 --- a/weaver/core/relay/credentials/docker/relay-network2-cert.pem +++ b/weaver/core/relay/credentials/docker/relay-network2-cert.pem @@ -1,32 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFejCCA2KgAwIBAgIUA2VGMJDEjDCexX75UCesc7tDWEwwDQYJKoZIhvcNAQEL -BQAwWzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv -cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ8wDQYDVQQDDAZXZWF2ZXIw -HhcNMjExMTExMjAzODQzWhcNMjIxMTExMjAzODQzWjBjMQswCQYDVQQGEwJJTjEL -MAkGA1UECAwCS0ExEjAQBgNVBAcMCUJhbmdhbG9yZTEMMAoGA1UECgwDSUJNMQww -CgYDVQQLDANSZXMxFzAVBgNVBAMMDnJlbGF5LW5ldHdvcmsyMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEA2Rwb+srcvFEGhKlUK9NdKQ70DjH3b1CPmnFq -brvZoyVmJykSpeem1J69b88aqX1bcfaVOPqQ3iExbgib5Q2i2RFUiHr5N2f6n3oS -GGEL9X68hEXjRldOO9bcjeq3Gk0aje6W4lGOwCIMdHX/hAmYFUQNDH+rtR/49VGC -7A41DV5smeU7NPL8E4QDbBFTrlmNWuRMnQPdBdxvKagYIXcNKNABBmz7zs/RuThQ -pGFePXawBaujBmL577dHsqvaKAPiieuKVSKVXmQDSozQiGlbyP2X/AYxUdwy+lVr -EXfHbqKUgJuxuxStbG3RK8YVpsyO6OrbJJg0rWeAUyN0MF4b5Own9bqPQ3phiM1c -pc6vPRknF2B2DJdHaGdLrMnY9TAeShdkuRM64Ug5xxikYWAKy3gdSGXLDCgzDW4B -W3nfAaZeOEdbniIbcjPKV5oqZDtQtARng4JwcUOr0U1Im97Tm1F9C8x/YjiBo2FC -ThMHopqM8jVShXLlVeGGNmK6bwO39sT4EnQTeUpggy3OY7ZhG1uIgZ3mRJcNxMPe -x6o0AtdQnA74LWH9iOTuhS6arhM5NK0BYn0oYPKMfYCr2kZoV5IXM2+S81H2i6mS -13JxlwhJ5K93Wo7Cd3T6rjZKjCULrIVrTEygL3LtmICL7ztWQdrrErHY2UTZc6As -l7TZ6BMCAwEAAaMuMCwwKgYDVR0RBCMwIYIOcmVsYXktbmV0d29yazKCCWxvY2Fs -aG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAopxeC0HYItROJ69oZJDrigSH -qgMK3RpqrCjP3pISaT8CdEN3JTAIYQPtEtizeDqXP/hup897J42pn19UkSpmFVFT -hrJCHNz2K1jxUTi/DraVq+vLpLpINGPP8eMLtBPHdDDB8ATU8/H4TioY2KDeM75K -PRrsA3dmixRnrHvNJZTw7NbgFJjlQfOblx/MznTCzQ1RVl/6Hx1mggYqWOdojXZl -dN7ykuoaH/0lgBCUepiZSk34XJ6iw5j0Ukzpf3ehDiaxlg9lNLca9vSG0n5528ed -hF9QA98j5C3bO4Jy0pydUOPvRGnACq2UBWqLPc3CvRUk7s/B2hDkuWeCZYFvhHWl -nDO9v/oHx0rP8nX9tVFvHZm2FqIUaUeP4YGqry4nw5VbbHb7Ox+037sDncsbkJHf -UYsF4VFcCABobwcJmKyvqoQ5MLjwXuuHK0JulptvHGKKWWJ9fFizPiUYc3RTej+0 -eyhBzgVZFKiM6xRSn7eBHhTgTIghfvFn6lD3W0QPLJ7TFgClazn3wO3Ki1hl2/2r -W9bTRwk7v1UYwLBBuF6liKBlCiQeED1ZstF0EqGVmGRUHJ30WUGsIa4DLT0Mwp7w -tqMZ0RGPMrNK7+QY86WzBua/u/PJQUPszGhVAgpzp5uP94ArHUS2ZuTRMgpRL8pi -msBX6Skxka67c7YGNFE= +MIIFeTCCA2GgAwIBAgIUPQuddNoq9wPRwyl2NzElogLNA3AwDQYJKoZIhvcNAQEL +BQAwWjELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCYW5nYWxv +cmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMQ4wDAYDVQQDDAVDYWN0aTAe +Fw0yNDA1MTUyMDE2MDdaFw0yOTA1MTUyMDE2MDdaMGMxCzAJBgNVBAYTAklOMQsw +CQYDVQQIDAJLQTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQwwCgYDVQQKDANJQk0xDDAK +BgNVBAsMA1JlczEXMBUGA1UEAwwOcmVsYXktbmV0d29yazIwggIiMA0GCSqGSIb3 +DQEBAQUAA4ICDwAwggIKAoICAQDQ24gBWRDRBGX6j9QWmW7wm3/fs8q4zrb2crZd +0TmzF0WXxZvgDX6XZPsdsIwoju3sBgZnf+70qjZIdF2ByUmgu38hoqiXSon6DQV6 +c+jKQx5rn4muR1MN3JCqJFqwSix6nDV0O/lj9w6QrNcwGWgAwf8dnHh539q19VIX +Twi+e3tIFMLZBqzl3oZdQcqDLJGi2RAMJNWnr6a7P3TCpiKc/gBJfd3DkKG7B1c/ +NpDQc9+SlVBJ8z4aQSN59diKk041drB9dQVi88WJaD9OF8sVvt3rtraFSXi2acNW +HDarraSqCkfCAqrHPlNfm06QQux2Hnb4ymt/Qqlu+dKuwza1xKV4LC4xOp0YZYh+ +B/mQJceCSj94BteIaNCLMtIUUlpGkD1k/wi6WR4qwhy8eD7M3YHSpMPBPjfG98Is +5m6oEjnKm2ittywFvHIaEUGt6WMR1p/aHBELXjG9Qv/e6mIfHj/vOi23PLwBRabP +juYaDw1nSNebcj5BQC1c4UGd7d/ZhAay/KzYxwA5+WASNVOGVdvwTX0Wvezih1Sn +f4VnYFPuChJsRGVQa+JjGxis0lrvdlodmy+WuyDmGG9Z0+6fnfiDmgTszd8Cqjq7 +MOmF8KCMbjXSrUC87td2zGjHMEZIp8H+X9BE6BPgeQmZLKYwaXQyUDEg/EF9/zL9 +NTKbJQIDAQABoy4wLDAqBgNVHREEIzAhgg5yZWxheS1uZXR3b3JrMoIJbG9jYWxo +b3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQBCp/7xwu366c7bJ50fT5vwry4B +OD/p9S5MQBlzRKdM7c+428WR/DQd0RLjOyH/t441dEC6an0Dj9HXWlvV04In3tUK +LUIvxKj00lOF/whJSnIhp5jU5kEZgkrbxgT9WfaWt/UwN10HmYqVR05RmZQuxtf/ +MiLmHio2DY1+AHj9yCz3MbcQwo81AmD/Y27vdIJfyvw71kgXOegw7KICtwHEgHJy +T8lD52+wLm70+sOW5VcIJ8jDbd03mY/x70ACk2E6CzdlSmLh5GyyjxugurpaOchi +524GgJUMhHFcmiX9dwKFAPus9pL9Qh443981Oz//z7lRDK+f+jrBmthv81+NVa1m +U+azDMG4p6eDJEuKv2caRaEIvqtJ8RAo8Tv0zrdDeAZuD9WLCETPXauRHhsXAnzg +5laP5mmG31gwbwLTOxuGdPZweM6hB8BzIxYbRNjjDl2rvYIet/+zBAHFUOjOI28H +CpnYLL1TTcuBBL6HdxvB65hcjGUPmW6/0YEdfcIhnF5iDLOWo/Hb1kX/45kGzylg +2zykeEi53NMf2j2Gz27VEwEej1Fx8WXU7lf8by0VXahhpBcQqatX+StqCjH0a6X6 +pZvExKuNoFvgemnXksIEwlrzc+XOiyL+JqmTdTQxJlGZVYGpgdE08RfhM/OH3Kga +OhLqppCnns0LA1FKFg== -----END CERTIFICATE----- diff --git a/weaver/core/relay/credentials/docker/relay-network2-csr.pem b/weaver/core/relay/credentials/docker/relay-network2-csr.pem index 6f52fc334b..d87462bb0a 100644 --- a/weaver/core/relay/credentials/docker/relay-network2-csr.pem +++ b/weaver/core/relay/credentials/docker/relay-network2-csr.pem @@ -1,29 +1,27 @@ -----BEGIN CERTIFICATE REQUEST----- -MIIE6jCCAtICAQAwYzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH +MIIEqDCCApACAQAwYzELMAkGA1UEBhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQH DAlCYW5nYWxvcmUxDDAKBgNVBAoMA0lCTTEMMAoGA1UECwwDUmVzMRcwFQYDVQQD DA5yZWxheS1uZXR3b3JrMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB -ANkcG/rK3LxRBoSpVCvTXSkO9A4x929Qj5pxam672aMlZicpEqXnptSevW/PGql9 -W3H2lTj6kN4hMW4Im+UNotkRVIh6+Tdn+p96EhhhC/V+vIRF40ZXTjvW3I3qtxpN -Go3uluJRjsAiDHR1/4QJmBVEDQx/q7Uf+PVRguwONQ1ebJnlOzTy/BOEA2wRU65Z -jVrkTJ0D3QXcbymoGCF3DSjQAQZs+87P0bk4UKRhXj12sAWrowZi+e+3R7Kr2igD -4onrilUilV5kA0qM0IhpW8j9l/wGMVHcMvpVaxF3x26ilICbsbsUrWxt0SvGFabM -jujq2ySYNK1ngFMjdDBeG+TsJ/W6j0N6YYjNXKXOrz0ZJxdgdgyXR2hnS6zJ2PUw -HkoXZLkTOuFIOccYpGFgCst4HUhlywwoMw1uAVt53wGmXjhHW54iG3IzyleaKmQ7 -ULQEZ4OCcHFDq9FNSJve05tRfQvMf2I4gaNhQk4TB6KajPI1UoVy5VXhhjZium8D -t/bE+BJ0E3lKYIMtzmO2YRtbiIGd5kSXDcTD3seqNALXUJwO+C1h/Yjk7oUumq4T -OTStAWJ9KGDyjH2Aq9pGaFeSFzNvkvNR9oupktdycZcISeSvd1qOwnd0+q42Sowl -C6yFa0xMoC9y7ZiAi+87VkHa6xKx2NlE2XOgLJe02egTAgMBAAGgQjATBgkqhkiG -9w0BCQcxBgwEYWJjZDArBgkqhkiG9w0BCQ4xHjAcMBoGA1UdEQQTMBGCCWxvY2Fs -aG9zdIcEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEAra9aKqGAw2LLxaELBWlk4pUI -Z37F8BGxx+y4H1qgMtaiSFsN+71j25HHM6YXcrIQMy5lcZVdkSDWBYSlk/tgUF7i -dVPjMcJ+q+VLoCK2Qwepi0UzTl5ZFmze0ZuXnSj+VPS5PUztSFOIKBNqIjbvzJUd -T2PLfZ5QBu4WBQvDtDrsrYrNISYXJ73jf9sC+0NLCliwhjJD8IDh0Jn90XGO56So -BJoq5w4twQoyuHEi/g26aqwK3rE92EfxuxuPi8qGXiocIR0fgMO9+vl89mhxRxrY -lONYTBJZXANYxlXCCPAxUwjVPxXDRG/RLTRc79v17v10OgTiXUnqq5tdKtysFfmY -d5ob5r96NnS42Vt4AOPQIHG2bo6n4mItD0sYLBOKmsO28ZMgW13K5xoL6z1wLq7G -JTmcJi36GT7xU9/wh21JJO414YyVZiiC5RKi7C/xAb8QCZxxqJlw9+R77x9iXNdk -8WqtuMt+yc6XmLoE/u90+p6pSxojJSu4eWNeUXOAyI4r0thPcXt309EATXTUX8+l -z8+2TDN6itfmeyNJdNVrsJOOJCHlyHK0r7ZkwUYWRcS3PIqb2GAJBkaSGIC2U9Ir -7yE/MYLjjZFPG1VkQG7tLNKnh0aCsVuMZfTtDvj3yamBAvKJEx2OC5/JkrwIvMOK -YMAq+EkvB2PIuRnEJ8s= +ANDbiAFZENEEZfqP1BaZbvCbf9+zyrjOtvZytl3RObMXRZfFm+ANfpdk+x2wjCiO +7ewGBmd/7vSqNkh0XYHJSaC7fyGiqJdKifoNBXpz6MpDHmufia5HUw3ckKokWrBK +LHqcNXQ7+WP3DpCs1zAZaADB/x2ceHnf2rX1UhdPCL57e0gUwtkGrOXehl1ByoMs +kaLZEAwk1aevprs/dMKmIpz+AEl93cOQobsHVz82kNBz35KVUEnzPhpBI3n12IqT +TjV2sH11BWLzxYloP04XyxW+3eu2toVJeLZpw1YcNqutpKoKR8ICqsc+U1+bTpBC +7HYedvjKa39CqW750q7DNrXEpXgsLjE6nRhliH4H+ZAlx4JKP3gG14ho0Isy0hRS +WkaQPWT/CLpZHirCHLx4PszdgdKkw8E+N8b3wizmbqgSOcqbaK23LAW8choRQa3p +YxHWn9ocEQteMb1C/97qYh8eP+86Lbc8vAFFps+O5hoPDWdI15tyPkFALVzhQZ3t +39mEBrL8rNjHADn5YBI1U4ZV2/BNfRa97OKHVKd/hWdgU+4KEmxEZVBr4mMbGKzS +Wu92Wh2bL5a7IOYYb1nT7p+d+IOaBOzN3wKqOrsw6YXwoIxuNdKtQLzu13bMaMcw +Rkinwf5f0EToE+B5CZkspjBpdDJQMSD8QX3/Mv01MpslAgMBAAGgADANBgkqhkiG +9w0BAQsFAAOCAgEAqhLIaUdRQra16dQ1YZ6ERUnoNpp5ZbA0DXG4N27YguKfP5Kv +Qnn3c49OtbYcbs5TjiFkGjoQdL4e47BRGLHJJ7FRDUfZI4gJXOGzEmVtXSxHyAVr +IjNDzPxbIzIVyIOOOfqjQIaBP4BMWtVs2JniocJ1Rley4PwDHpcwxtY+sJN9O/A+ +CRjLG1QN8x1nIMxviknF+X0sjI/Cf0r3oIydrNsHNNE9z14bbCpulftMZOu1GRZ1 +BHe7FAPhOImkeF4ZJ6nnkktOhGHlOL+vr/lNZRa1rtZFTp0vYfcFB8vVQVCVq0Km +UoyHea6eGDmVi6z4IcJ8P1BHoRJhgeylZ25Mf3bI/pddflf8EHWn+NlxaWwfysxA +bIVORdMpPVgl2y+lF+EiL8BhpCrErMHdfuEaN3Ie8SrqGVUF7434jvjZchFNDYt1 +Oho89UWNpG5FW+dI1Ksg3uhF0PAYK5k1+7QQDkYDwWWph2NFLSy6tJyPdnnP0Pyu +eWeYwhnyiPWi+5nQG6w0AKYeuvzuEHpxj1iXcx9+I5dGWeUMV6qIOb1LYKgYKhcO +a0M3zZd0S9v9wa5NtT5aFUnM0xsTn87KNtYQwEuiQWChhfTF1tGg+XkJu4B52rm7 +mtn06s0xdQusWGTdt03bR4iS+Gk3QTgHdgQhLiH4O4LO09p4akEPm26hiaI= -----END CERTIFICATE REQUEST----- diff --git a/weaver/core/relay/credentials/docker/relay-network2-key.pem b/weaver/core/relay/credentials/docker/relay-network2-key.pem index eac7ae1c80..d60650a6eb 100644 --- a/weaver/core/relay/credentials/docker/relay-network2-key.pem +++ b/weaver/core/relay/credentials/docker/relay-network2-key.pem @@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY----- -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 -QvzjFJZHEi2OkN/qWHzlwv7yAZ8BMQ== +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 +XFv6laChOPb+CzGQWRFIQNP6qY2rsA== -----END PRIVATE KEY----- diff --git a/weaver/core/relay/credentials/docker/relay_drivers_trust_store.jks b/weaver/core/relay/credentials/docker/relay_drivers_trust_store.jks index ee6e4abdce..c898a75260 100644 Binary files a/weaver/core/relay/credentials/docker/relay_drivers_trust_store.jks and b/weaver/core/relay/credentials/docker/relay_drivers_trust_store.jks differ diff --git a/weaver/core/relay/docs/README.md b/weaver/core/relay/docs/README.md index 16d1cd2127..5965326478 100644 --- a/weaver/core/relay/docs/README.md +++ b/weaver/core/relay/docs/README.md @@ -1,23 +1,30 @@ # SATP Gateway -The Weaver rely has been augmented to include the SATP implementation. Here are the steps to run and test this implementation: +The Weaver relay has been augmented to include a sample SATP implementation, thereby making it function as a SATP gateway. Here are the steps to run and test this implementation: -## Run two test Fabric networks +(_Note_: all `cd` commands in this page are meant to be run from the root folder of your clone of the Cacti repository.) + +## Run Two Fabric Test-Networks ``` $ cd weaver/tests/network-setups/fabric/dev $ make start-interop-local CHAINCODE_NAME=satpsimpleasset ``` -## Run the gateway +## Initialize the Logging Database -Before running the gateway, you need to ensure SQLite (the default database for logs) is installed: +Before running the gateway, you need to ensure that SQLite (the default database for logs) is installed. Sample instructions for Ubuntu are given below: ``` sudo apt-get update -sudo apt-get install libsqlite3-dev +sudo apt-get install sqlite3 libsqlite3-dev ``` -Use your favorite tool to create a SQLite database named 'gateway_log.db' and create the following table: +Use the SQLite tool on your system to create a SQLite database named 'gateway_log.db'. In Ubuntu, run the following command (after the above installation) for this: +``` +$ cd weaver/core/relay +$ sqlite3 gateway_log.db +``` +The above command will create a database file and also drop an SQLite shell, where you must create a table (for recording log entries) using the following SQL query: ``` CREATE TABLE log_entries ( id INTEGER PRIMARY KEY, @@ -33,123 +40,113 @@ CREATE TABLE log_entries ( details TEXT ); ``` +You can do this and exit the SQLite shell as follows: +``` +sqlite> CREATE TABLE log_entries ( + ...> id INTEGER PRIMARY KEY, + ...> debug_level TEXT, + ...> timestamp TEXT, + ...> request_id TEXT, + ...> request TEXT, + ...> step_id TEXT, + ...> operation TEXT, + ...> network_id TEXT, + ...> gateway_id TEXT, + ...> received TEXT, + ...> details TEXT + ...> ); +sqlite> .quit +``` +At any time, you can generate a readable form of the database as follows (example below): +``` +$ sqlite3 gateway_log.db .dump > gateway_log.sql +``` -In a new terminal, run the following commands: +## Run the Gateways + +We will use `Fabric_Relay` as the gateway for `network1` and `Fabric_Relay2` for `network2`. Install the components and set up appropriate configurations for each according to instructions in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/setup-local/#fabric-relay. Use the same instructions to launch relays (as called out below): + +To launch a gateway for Fabric `network1`, run from a new terminal window: +``` +$ cd weaver/core/relay +$ RELAY_CONFIG=config/Fabric_Relay.toml cargo run --bin server +``` +To launch a gateway for Fabric `network2`, run from a new terminal window: ``` $ cd weaver/core/relay -$ RELAY_CONFIG=config/Dummy_Relay.toml cargo run --bin server +$ RELAY_CONFIG=config/Fabric_Relay2.toml cargo run --bin server ``` +(_Note_: by running the above commands, the logs from both gateways will be written to the same `gateway_log.db` file. To separate these logs, you should make a copy of the `relay` folder, create a `gateway_log.db` in each, and launch separate relay instances from both folders.) -## Run the Fabric driver +## Run the Fabric Drivers Ensure that you have the correct configuration in the file .env In a new terminal, run the following commands: +We will use the default drivers associated with `Fabric_Relay` and `Fabric_Relay2` as specified in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/setup-local. Install the components and set up appropriate configurations for each according to instructions in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/setup-local/#fabric-driver. Use the same instructions to launch drivers (as called out below): +To launch a driver for Fabric `network1`, run from a new terminal window: ``` $ cd weaver/core/drivers/fabric-driver -$ cat .env - -CONNECTION_PROFILE=/home/user/cacti/weaver/tests/network-setups/fabric/network-artifacts/network1/peerOrganizations/org1.network1.com/connection-org1.json -RELAY_ENDPOINT=localhost:9085 -RELAY_TLS=false -RELAY_TLSCA_CERT_PATH=path_to_tls_ca_cert_pem_for_relay -DRIVER_ENDPOINT=localhost:9090 -DRIVER_TLS=false -DRIVER_TLS_CERT_PATH=path_to_tls_cert_pem_for_driver -DRIVER_TLS_KEY_PATH=path_to_tls_key_pem_for_driver -NETWORK_NAME=network1 -DRIVER_CONFIG= -INTEROP_CHAINCODE=interop -MOCK=false -DB_PATH=driverdbs -#WALLET_PATH=/home/user/cacti/weaver/samples/fabric/fabric-cli/src/wallet-network1 -WALLET_PATH=/home/user/cacti/weaver/core/drivers/fabric-driver/wallet-network1 -DEBUG=true -LEVELDB_LOCKED_MAX_RETRIES= -LEVELDB_LOCKED_RETRY_BACKOFF_MSEC= -ENABLE_MONITOR=false -MONITOR_SYNC_PERIOD= -MEMBER_CREDENTIAL_FOLDER=/home/user/cacti/weaver/samples/fabric/fabric-cli/src/data/credentials -CONFIG_PATH=/home/user/cacti/weaver/samples/fabric/fabric-cli/config.json -DEFAULT_APPLICATION_CHAINCODE=simpleassettransfer -REMOTE_CONFIG_PATH=/home/user/cacti/weaver/samples/fabric/fabric-cli/remote-network-config.json -CHAINCODE_PATH=/home/user/cacti/weaver/samples/fabric/fabric-cli/chaincode.json - -``` - -Run the driver - +$ npm run dev +``` +To launch a driver for Fabric `network2`, run from a new terminal window: ``` $ cd weaver/core/drivers/fabric-driver -$ make build-local -$ npm run dev +$ CONNECTION_PROFILE=/opt/gopath/src/github.com/VRamakrishna/cacti/weaver/tests/network-setups/fabric/shared/network2/peerOrganizations/org1.network2.com/connection-org1.json NETWORK_NAME=network2 RELAY_ENDPOINT=localhost:9083 DRIVER_ENDPOINT=localhost:9095 npm run dev ``` -# Build the satpsimpleasset chaincode - -In a new terminal, run the following commands: +## Configure the Fabric-CLI +Configure Fabric-CLI parameters in a `config.json` and a `.env` as indicated in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/ledger-initialization/#initializing-the-fabric-networks (use instructions for relays and drivers deployed in host machines). In the `config.json`, make sure the `chaincode` values are set to `satpsimpleasset`. For the `.env`, only the following settings are mandatory: ``` -$ cd weaver/samples/fabric/satpsimpleasset -$ make build-local +MEMBER_CREDENTIAL_FOLDER=/samples/fabric/fabric-cli/src/data/credentials +CONFIG_PATH=./config.json +DEFAULT_APPLICATION_CHAINCODE=satpsimpleasset ``` - -# Run the Fabric cli - -The Fabric-cli could be used for creating testing assets. Ensure you have the correct configuration. In a new terminal, run the following commands: - +Configure the Fabric-CLI as per the instructions in the above link (as called out below): ``` $ cd weaver/samples/fabric/fabric-cli -$ cat config.json - -{ - "network1": { - "connProfilePath": "/home/user/cacti/weaver/tests/network-setups/fabric/network-artifacts/network1/peerOrganizations/org1.network1.com/connection-org1.json", - "relayEndpoint": "localhost:9080", - "mspId": "Org1MSP", - "channelName": "mychannel", - "chaincode": "satpsimpleasset", - "aclPolicyPrincipalType": "ca" - }, - "network2": { - "connProfilePath": "/home/user/cacti/weaver/tests/network-setups/fabric/network-artifacts/network2/peerOrganizations/org1.network2.com/connection-org1.json", - "relayEndpoint": "localhost:9083", - "mspId": "Org1MSP", - "channelName": "mychannel", - "chaincode": "satpsimpleasset", - "aclPolicyPrincipalType": "certificate" - } -} -``` - -Create sample assets: +$ ./bin/fabric-cli env set-file ./.env +``` +## Initialize Asset Records in `network1` + +Use the Fabric-CLI to initialize a set of sample assets only in `network1`. In a new terminal, run: ``` $ cd weaver/samples/fabric/fabric-cli $ ./bin/fabric-cli configure asset add --target-network=network1 --type=bond --data-file=./src/data/assets.json ``` -Ensure Alice and Bob ids are available: +## Ensure that Recipient Wallet ID is available with the `network2` Driver +Copy wallet ID of user `bob` to the wallet of the `network2` Fabric driver. (_Note_: this is a shortcut for convenience. The driver only needs to know the certificate adn doesn't need the full wallet ID, which includes the secret signing key.) ``` -$~/cacti/weaver/samples/fabric/fabric-cli/src/wallet-network1$ cp alice.id /home/user/cacti/weaver/core/drivers/fabric-driver/wallet-network1 -$~/cacti/weaver/samples/fabric/fabric-cli/src/wallet-network1$ cp bob.id /home/user/cacti/weaver/core/drivers/fabric-driver/wallet-network1 -$~/cacti/weaver/samples/fabric/fabric-cli/src/wallet-network1$ cd ../wallet-network2 -$~/cacti/weaver/samples/fabric/fabric-cli/src/wallet-network2$ cp alice.id /home/user/cacti/weaver/core/drivers/fabric-driver/wallet-network2 -$~/cacti/weaver/samples/fabric/fabric-cli/src/wallet-network2$ cp bob.id /home/user/cacti/weaver/core/drivers/fabric-driver/wallet-network2 +$ cd weaver/samples/fabric/fabric-cli +$ cp src/wallet-network2/bob.id /core/drivers/fabric-driver/wallet-network2 ``` -## Run the client +## Run the Sample SATP client -This client will trigger the SATP protocol by sending an asset transfer request. In a new terminal, run the following commands: +This client will trigger the SATP protocol by sending a request to `network1`'s relay to transfer an asset to `network2` via its relay. The command structure is as follows: +``` +$ cargo run --bin satp_client +``` +In a new terminal, run the following commands (to transfer an asset from one Fabric testnet, `network1`, to another, `network2`): ``` $ cd weaver/core/relay -$ cargo run --bin satp_client "9085" "localhost:9085/Dummy_Network/abc:abc:abc:abc" +$ cargo run --bin satp_client Fabric_Relay network1 bond01 a05 alice satpsimpleasset network2 Fabric_Relay2 bob satpsimpleasset ``` -You should noticed that the messages started to be exchanged between the two gateways. The logs can be seen in the corresponding terminals. +View the messages exchanged between the two gateways in their corresponding terminal windows. + +Verify the asset transfer success by checking that the asset is not present in `network1` and instead now belongs (with a different id and type) to `bob` in `network2` using the following Fabric-CLI commands: +``` +$ cd weaver/samples/fabric/fabric-cli +$ ./bin/fabric-cli chaincode query --user=alice mychannel satpsimpleasset ReadAsset '["bond01","a05"]' --local-network=network1 +$ ./bin/fabric-cli chaincode query --user=bob mychannel satpsimpleasset ReadAsset '["bond01_new","a05_new"]' --local-network=network2 +``` diff --git a/weaver/core/relay/src/main.rs b/weaver/core/relay/src/main.rs index 0d7cbaf14c..67902f072d 100644 --- a/weaver/core/relay/src/main.rs +++ b/weaver/core/relay/src/main.rs @@ -72,7 +72,7 @@ async fn main() -> Result<(), Box> { .unwrap(); let relay_name = settings.get_str("name").expect("No Relay name provided"); - info!("Relay Name: {:?}", relay_name); + println!("Relay Name: {:?}", relay_name); let relay_port = settings.get_str("port").expect(&format!("Port does not exist for relay name {}. Make sure the config file <{}> has the name and port specified.", relay_name, config_file_name.to_string())); let host = settings .get_str("hostname") @@ -100,9 +100,9 @@ async fn main() -> Result<(), Box> { let network = NetworkService { config_lock: RwLock::new(settings.clone()), }; - info!("RelayServer listening on {}", addr); + println!("RelayServer listening on {}", addr); if with_tls == true { - debug!("Starting Server with TLS"); + println!("Starting Server with TLS"); let cert = tokio::fs::read(settings.get_str("cert_path").unwrap()).await?; let key = tokio::fs::read(settings.get_str("key_path").unwrap()).await?; let identity = Identity::from_pem(cert, key); diff --git a/weaver/core/relay/src/relay_proto.rs b/weaver/core/relay/src/relay_proto.rs index d832304bf3..97d8cf89f7 100644 --- a/weaver/core/relay/src/relay_proto.rs +++ b/weaver/core/relay/src/relay_proto.rs @@ -37,7 +37,7 @@ pub fn parse_address(address: String) -> Result { } #[allow(dead_code)] -fn parse_location(location: String) -> Result { +pub fn parse_location(location: String) -> Result { let v: Vec<&str> = location.split(":").collect(); if v.len() != 2 { return Err(Error::new( diff --git a/weaver/core/relay/src/sample_satp_client.rs b/weaver/core/relay/src/sample_satp_client.rs index 84bedb7f2c..b2b51cc3fb 100644 --- a/weaver/core/relay/src/sample_satp_client.rs +++ b/weaver/core/relay/src/sample_satp_client.rs @@ -1,6 +1,9 @@ mod relay_proto; -use relay_proto::get_url; +use relay_proto::{get_url, LocationSegment}; use std::env; +use std::fs::File; +use std::io::prelude::*; +use std::path::Path; use weaverpb::common::ack::ack; use weaverpb::networks::networks::{network_client::NetworkClient, NetworkAssetTransfer}; @@ -13,33 +16,70 @@ async fn main() -> Result<(), Box> { async fn asset_transfer() -> Result<(), Box> { let args: Vec = env::args().collect(); - let net_addr = format!("http://{}", get_url(&args)); - let mut network_client = NetworkClient::connect(net_addr).await?; - // localhost:9081/Corda_Network/test - // {locationsegment}/{Network_id}/{query} - // localhost:9081/Corda_Network/mychannel:simplestate:read:TestState + if args.len() != 11 { + println!("Need exactly 10 arguments ; supplied {:?}", args.len()); + std::process::exit(1); + } + // Get local relay info + let local_relay_filename = format!("config/{}.toml", args[1].to_string()); + let mut settings = config::Config::default(); + settings + .merge(config::File::with_name(&local_relay_filename)) + .unwrap(); + let local_relay_host = settings + .get_str("hostname") + .unwrap_or("localhost".to_string()); + let local_relay_name = settings.get_str("name").expect("No Relay name provided"); + println!("Relay Name: {:?}", local_relay_name); + let local_relay_port = settings.get_str("port").expect(&format!("Port does not exist for relay name {}. Make sure the config file <{}> has the name and port specified.", local_relay_name, local_relay_filename.to_string())); + let local_relay = format!("{}:{}", local_relay_host, local_relay_port); + // Get destination relay info + let relays_table = settings.get_table("relays")?; + let relay_uri = relays_table + .get(&args[8].to_string()) + .ok_or("Relay name not found")?; + let uri = relay_uri.clone().try_into::()?; + let dest_relay = format!("{}:{}", uri.hostname.to_string(), uri.port.to_string()); + let net_addr = format!("http://{}", local_relay); let request = tonic::Request::new(NetworkAssetTransfer { - policy: vec!["test".to_string()], - address: args[2].to_string(), - requesting_relay: "Dummy_relay".to_string(), - requesting_network: "".to_string(), - requesting_org: "".to_string(), - certificate: "test".to_string(), - requestor_signature: "test".to_string(), - nonce: "test".to_string(), - confidential: false, + asset_type: args[3].to_string(), + asset_id: args[4].to_string(), + sender: args[5].to_string(), + source_contract_id: args[6].to_string(), + source_relay: local_relay, + source_network: args[2].to_string(), + destination_relay: dest_relay, + destination_network: args[7].to_string(), + recipient: args[9].to_string(), + destination_contract_id: args[10].to_string(), }); + // TODO: Write the asset info to a file the Fabric drivers can access + // This is a hack; we need to pass this info via stateless API calls + // This won't work in Docker mode (none of the sample SATP code does) + let asset_info_path = Path::new("../drivers/fabric-driver/satp_info.txt"); + let display = asset_info_path.display(); + let mut asset_info_file = match File::create(&asset_info_path) { + Err(e) => panic!("Unable to create asset info file {} for Fabric driver: {}", display, e), + Ok(file) => file, + }; + let asset_info = format!("{}:{}", args[3].to_string(), args[4].to_string()); + match asset_info_file.write_all(asset_info.as_bytes()) { + Err(e) => panic!("Unable to write asset info {} to {}: {}", asset_info, display, e), + Ok(_) => (), + } + + let mut network_client = NetworkClient::connect(net_addr).await?; let response = network_client.request_asset_transfer(request).await?; - println!("RESPONSE={:?}", response); + println!("RESPONSE FROM RELAY SERVER = {:?}", response); match ack::Status::from_i32(response.get_ref().status) { Some(ack_status) => match ack_status { ack::Status::Ok => { // TODO poll for asset transfer status - println!("Asset Transfer: Success!"); + println!("Asset transfer request submitted successfully!"); } ack::Status::Error => { - println!("An error occurred in request_asset_transfer call"); + println!("An error occurred while submitting an asset transfer request!"); std::process::exit(1); } }, diff --git a/weaver/core/relay/src/services/network_service.rs b/weaver/core/relay/src/services/network_service.rs index 7f4e6d9500..d45615b606 100644 --- a/weaver/core/relay/src/services/network_service.rs +++ b/weaver/core/relay/src/services/network_service.rs @@ -538,47 +538,32 @@ impl Network for NetworkService { get_request_id_from_transfer_proposal_claims(transfer_proposal_claims_request.clone()); // TODO refactor / add log entry - let parsed_address = parse_address(network_asset_transfer.address.to_string()); - match parsed_address { - Ok(_address) => { - let (relay_host, relay_port) = get_relay_from_transfer_proposal_claims( - transfer_proposal_claims_request.clone(), - ); - let (use_tls, tlsca_cert_path) = - get_relay_params(relay_host.clone(), relay_port.clone(), conf.clone()); + let (relay_host, relay_port) = get_relay_from_transfer_proposal_claims( + transfer_proposal_claims_request.clone(), + ); + let (use_tls, tlsca_cert_path) = + get_relay_params(relay_host.clone(), relay_port.clone(), conf.clone()); - // TODO: verify that host and port are valid - // Spawns a child process to handle sending request - spawn_send_transfer_proposal_claims_request( - transfer_proposal_claims_request, - relay_host, - relay_port, - use_tls, - tlsca_cert_path, - ); - // Send Ack back to network while request is happening in a thread - let reply = Ack { - status: ack::Status::Ok as i32, - request_id: request_id, - message: "Ack of the asset transfer request".to_string(), - }; - println!( - "Sending Ack of the asset transfer request back to network: {:?}\n", - reply - ); - Ok(Response::new(reply)) - } - Err(e) => { - println!("Invalid Address"); - let reply = Ack { - status: ack::Status::Error as i32, - request_id: request_id, - message: format!("Error: Ack of the asset transfer request {:?}", e), - }; - println!("Sending Ack back with an error to network: {:?}\n", reply); - Ok(Response::new(reply)) - } - } + // TODO: verify that host and port are valid + // Spawns a child process to handle sending request + spawn_send_transfer_proposal_claims_request( + transfer_proposal_claims_request, + relay_host, + relay_port, + use_tls, + tlsca_cert_path, + ); + // Send Ack back to network while request is happening in a thread + let reply = Ack { + status: ack::Status::Ok as i32, + request_id: request_id, + message: "Ack of the asset transfer request".to_string(), + }; + println!( + "Sending Ack of the asset transfer request back to network: {:?}\n", + reply + ); + Ok(Response::new(reply)) } } diff --git a/weaver/core/relay/src/services/sample_satp_helper.rs b/weaver/core/relay/src/services/sample_satp_helper.rs index 786167facf..6a04dcb769 100644 --- a/weaver/core/relay/src/services/sample_satp_helper.rs +++ b/weaver/core/relay/src/services/sample_satp_helper.rs @@ -1,5 +1,5 @@ use crate::error::Error; -use crate::relay_proto::LocationSegment; +use crate::relay_proto::{parse_location, LocationSegment}; use crate::services::helpers::get_driver_client; use crate::services::logger::Operation; use config::Config; @@ -19,6 +19,7 @@ use weaverpb::relay::satp::{ }; use super::logger::LogEntry; use super::types::Driver; +use uuid::Uuid; // Sends a request to the receiving gateway pub fn spawn_send_transfer_proposal_claims_request( @@ -857,20 +858,21 @@ pub fn create_ack_error_message( } pub fn create_transfer_proposal_claims_request( - _network_asset_transfer: NetworkAssetTransfer, + network_asset_transfer: NetworkAssetTransfer, ) -> TransferProposalClaimsRequest { + // TODO: remove hard coded values let transfer_proposal_claims_request = TransferProposalClaimsRequest { message_type: "message_type1".to_string(), client_identity_pubkey: "client_identity_pubkey1".to_string(), server_identity_pubkey: "server_identity_pubkey1".to_string(), - asset_asset_id: "asset_asset_id".to_string(), - asset_profile_id: "asset_profile_id".to_string(), + asset_asset_id: network_asset_transfer.asset_id, + asset_profile_id: network_asset_transfer.asset_type, verified_originator_entity_id: "verified_originator_entity_id".to_string(), verified_beneficiary_entity_id: "verified_beneficiary_entity_id".to_string(), originator_pubkey: "originator_pubkey".to_string(), beneficiary_pubkey: "beneficiary_pubkey".to_string(), - sender_gateway_network_id: "sender_gateway_network_id".to_string(), - recipient_gateway_network_id: "recipient_gateway_network_id".to_string(), + sender_gateway_network_id: network_asset_transfer.source_relay, + recipient_gateway_network_id: network_asset_transfer.destination_relay, sender_gateway_owner_id: "sender_gateway_owner_id".to_string(), receiver_gateway_owner_id: "receiver_gateway_owner_id".to_string(), }; @@ -880,7 +882,8 @@ pub fn create_transfer_proposal_claims_request( pub fn create_transfer_commence_request( _transfer_proposal_receipt_request: TransferProposalReceiptRequest, ) -> TransferCommenceRequest { - let session_id = "to_be_calculated_session_id"; + // TODO: remove hard coded values + let session_id = Uuid::new_v4(); let transfer_commence_request = TransferCommenceRequest { message_type: "message_type1".to_string(), session_id: session_id.to_string(), @@ -896,21 +899,21 @@ pub fn create_transfer_commence_request( } pub fn create_transfer_proposal_receipt_request( - _transfer_proposal_claims_request: TransferProposalClaimsRequest, + transfer_proposal_claims_request: TransferProposalClaimsRequest, ) -> TransferProposalReceiptRequest { // TODO: remove hard coded values let transfer_proposal_receipt_request = TransferProposalReceiptRequest { message_type: "message_type1".to_string(), client_identity_pubkey: "client_identity_pubkey1".to_string(), server_identity_pubkey: "server_identity_pubkey1".to_string(), - asset_asset_id: "asset_asset_id".to_string(), - asset_profile_id: "asset_profile_id".to_string(), + asset_asset_id: transfer_proposal_claims_request.asset_asset_id, + asset_profile_id: transfer_proposal_claims_request.asset_profile_id, verified_originator_entity_id: "verified_originator_entity_id".to_string(), verified_beneficiary_entity_id: "verified_beneficiary_entity_id".to_string(), originator_pubkey: "originator_pubkey".to_string(), beneficiary_pubkey: "beneficiary_pubkey".to_string(), - sender_gateway_network_id: "sender_gateway_network_id".to_string(), - recipient_gateway_network_id: "recipient_gateway_network_id".to_string(), + sender_gateway_network_id: transfer_proposal_claims_request.sender_gateway_network_id, + recipient_gateway_network_id: transfer_proposal_claims_request.recipient_gateway_network_id, sender_gateway_owner_id: "sender_gateway_owner_id".to_string(), receiver_gateway_owner_id: "receiver_gateway_owner_id".to_string(), }; @@ -1068,82 +1071,102 @@ pub fn create_assign_asset_request( } pub fn get_relay_from_transfer_proposal_claims( - _transfer_proposal_claims_request: TransferProposalClaimsRequest, + transfer_proposal_claims_request: TransferProposalClaimsRequest, ) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + let recipient_gateway_id = transfer_proposal_claims_request.recipient_gateway_network_id.clone(); + let parsed_location = parse_location(recipient_gateway_id.clone()); + match parsed_location { + Ok(location) => { + return (location.hostname, location.port); + } + Err(e) => { + println!("Error parsing recipient gateway address {}: {:?}\n", recipient_gateway_id, e); + return ("".to_string(), "".to_string()); + } + } } pub fn get_relay_from_transfer_proposal_receipt( - _transfer_proposal_receipt_request: TransferProposalReceiptRequest, + transfer_proposal_receipt_request: TransferProposalReceiptRequest, ) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + let sender_gateway_id = transfer_proposal_receipt_request.sender_gateway_network_id.clone(); + let parsed_location = parse_location(sender_gateway_id.clone()); + match parsed_location { + Ok(location) => { + return (location.hostname, location.port); + } + Err(e) => { + println!("Error parsing sender gateway address {}: {:?}\n", sender_gateway_id, e); + return ("".to_string(), "".to_string()); + } + } } pub fn get_relay_from_transfer_commence( _transfer_commence_request: TransferCommenceRequest, ) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + return ("localhost".to_string(), "9083".to_string()); } pub fn get_relay_from_ack_commence(_ack_commence_request: AckCommenceRequest) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + return ("localhost".to_string(), "9080".to_string()); } pub fn get_relay_from_lock_assertion( _lock_assertion_request: LockAssertionRequest, ) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + return ("localhost".to_string(), "9083".to_string()); } pub fn get_relay_from_commit_prepare( _commit_prepare_request: CommitPrepareRequest, ) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + return ("localhost".to_string(), "9083".to_string()); } pub fn get_relay_from_commit_ready(_commit_ready_request: CommitReadyRequest) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + return ("localhost".to_string(), "9080".to_string()); } pub fn get_relay_from_commit_final_assertion( _commit_final_assertion_request: CommitFinalAssertionRequest, ) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + return ("localhost".to_string(), "9083".to_string()); } pub fn get_relay_from_ack_final_receipt( _ack_final_receipt_request: AckFinalReceiptRequest, ) -> (String, String) { // TODO - return ("localhost".to_string(), "9085".to_string()); + return ("localhost".to_string(), "9080".to_string()); } pub fn get_driver_address_from_perform_lock(_perform_lock_request: PerformLockRequest) -> String { // TODO - return "localhost:9085/Dummy_Network/abc:abc:abc:abc".to_string(); + return "localhost:9080/network1/assettransfer".to_string(); } pub fn get_driver_address_from_create_asset(_create_asset_request: CreateAssetRequest) -> String { // TODO - return "localhost:9085/Dummy_Network/abc:abc:abc:abc".to_string(); + return "localhost:9083/network2/assettransfer".to_string(); } pub fn get_driver_address_from_extinguish(_extinguish_request: ExtinguishRequest) -> String { // TODO - return "localhost:9085/Dummy_Network/abc:abc:abc:abc".to_string(); + return "localhost:9080/network1/assettransfer".to_string(); } pub fn get_driver_address_from_assign_asset(_assign_asset_request: AssignAssetRequest) -> String { // TODO - return "localhost:9085/Dummy_Network/abc:abc:abc:abc".to_string(); + return "localhost:9083/network2/assettransfer".to_string(); } pub fn get_relay_params(relay_host: String, relay_port: String, conf: Config) -> (bool, String) { diff --git a/weaver/docs/docs/external/getting-started/test-network/setup-local.md b/weaver/docs/docs/external/getting-started/test-network/setup-local.md index 6d7e3892a2..3feab406e9 100644 --- a/weaver/docs/docs/external/getting-started/test-network/setup-local.md +++ b/weaver/docs/docs/external/getting-started/test-network/setup-local.md @@ -771,7 +771,7 @@ Run a Corda driver as follows: ``` - Run the following to start Corda driver for `Corda_Network2`: ```bash - DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver + DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda ``` If the driver starts successfully, it should log the following message on your terminal: ``` diff --git a/weaver/docs/docs/external/getting-started/test-network/setup-packages.md b/weaver/docs/docs/external/getting-started/test-network/setup-packages.md index 2699407ae3..787c545657 100644 --- a/weaver/docs/docs/external/getting-started/test-network/setup-packages.md +++ b/weaver/docs/docs/external/getting-started/test-network/setup-packages.md @@ -673,7 +673,7 @@ Run a Corda driver as follows: - Navigate to the `weaver/core/drivers/corda-driver` folder. - Run the following to start Corda driver for `Corda_Network`: ```bash - ./build/install/corda-driver/bin/corda-driver + ./build/install/driver-corda/bin/driver-corda ``` If the driver starts successfully, it should log the following message on your terminal: ``` @@ -681,7 +681,7 @@ Run a Corda driver as follows: ``` - Run the following to start Corda driver for `Corda_Network2`: ```bash - DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver + DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda ``` If the driver starts successfully, it should log the following message on your terminal: ``` diff --git a/weaver/samples/fabric/satpsimpleasset/Makefile b/weaver/samples/fabric/satpsimpleasset/Makefile index 0b11edb7ab..6e83f7407e 100644 --- a/weaver/samples/fabric/satpsimpleasset/Makefile +++ b/weaver/samples/fabric/satpsimpleasset/Makefile @@ -2,6 +2,7 @@ run-vendor: go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2=../../../core/network/fabric-interop-cc/interfaces/asset-mgmt/ go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ + go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils=../../../core/network/fabric-interop-cc/libs/utils/ go mod vendor undo-vendor: @@ -9,6 +10,7 @@ undo-vendor: go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils build-local: run-vendor build undo-vendor diff --git a/weaver/samples/fabric/satpsimpleasset/assetmgmt.go b/weaver/samples/fabric/satpsimpleasset/assetmgmt.go index ac626b514b..a187598bc3 100644 --- a/weaver/samples/fabric/satpsimpleasset/assetmgmt.go +++ b/weaver/samples/fabric/satpsimpleasset/assetmgmt.go @@ -12,6 +12,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" + wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" log "github.com/sirupsen/logrus" ) @@ -43,6 +44,43 @@ func (s *SmartContract) BondAssetSpecificChecks(ctx contractapi.TransactionConte return nil } +// LockAssetForSATP transfers the ownership of an asset to a calling relay. +// TODO: Currently, this is a hacky implementation. +// We will need to add some logic for owner's consent that can be verified here. +// Right now, we are treating the relay as a trusted party. +func (s *SmartContract) LockAssetForSATP(ctx contractapi.TransactionContextInterface, assetType, id string) error { + // Read asset + asset, err := getBondAsset(ctx, assetType, id) + if err != nil { + return err + } + // Allow access for modification if caller is either the owner or a relay + relayAccessCheck, err := wutils.IsClientRelay(ctx.GetStub()) + if err != nil { + return err + } + if !relayAccessCheck && !isCallerAssetOwner(ctx, asset) { + return logThenErrorf("Illegal update: caller is not owner of asset %s nor is a relay\n", asset.ID) + } + + // Ensure that the asset is not locked + if isBondAssetLocked(s, ctx, asset) { + return logThenErrorf("Cannot update attributes of locked asset %s\n", asset.ID) + } + + recipientECertBase64, err := getECertOfTxCreatorBase64(ctx) + if err != nil { + return logThenErrorf(err.Error()) + } + asset.Owner = recipientECertBase64 + assetJSON, err := json.Marshal(asset) + if err != nil { + return logThenErrorf(err.Error()) + } + + return ctx.GetStub().PutState(getBondAssetKey(assetType, id), assetJSON) +} + // Ledger transaction (invocation) functions func (s *SmartContract) LockAsset(ctx contractapi.TransactionContextInterface, assetExchangeAgreementSerializedProto64 string, lockInfoSerializedProto64 string) (string, error) { @@ -51,6 +89,10 @@ func (s *SmartContract) LockAsset(ctx contractapi.TransactionContextInterface, a if err != nil { return "", err } + err = s.BondAssetSpecificChecks(ctx, assetAgreement.AssetType, assetAgreement.Id, lockInfoSerializedProto64) + if err != nil { + return "", logThenErrorf(err.Error()) + } contractId, err := s.amc.LockAsset(ctx, assetExchangeAgreementSerializedProto64, lockInfoSerializedProto64) if err != nil { @@ -165,32 +207,32 @@ func (s *SmartContract) ClaimAsset(ctx contractapi.TransactionContextInterface, } } -func (s *SmartContract) AssignAsset(ctx contractapi.TransactionContextInterface, assetAgreementSerializedProto64 string, claimInfoSerializedProto64 string) (bool, error) { - assetAgreement, err := s.amc.ValidateAndExtractAssetAgreement(assetAgreementSerializedProto64) +func (s *SmartContract) AssignAssetForSATP(ctx contractapi.TransactionContextInterface, assetType, assetId, recipientECertBase64 string) error { + // Allow access for assigning only if caller is a relay + relayAccessCheck, err := wutils.IsClientRelay(ctx.GetStub()) if err != nil { - return false, err + return err } - - // Change asset ownership to claimant - recipientECertBase64, err := getECertOfTxCreatorBase64(ctx) - if err != nil { - return false, logThenErrorf(err.Error()) + if !relayAccessCheck { + return logThenErrorf("Illegal update: caller is not a relay\n") } - asset, err := getBondAsset(ctx, assetAgreement.AssetType, assetAgreement.Id) + + // Change asset ownership to recipient + asset, err := getBondAsset(ctx, assetType, assetId) if err != nil { - return false, logThenErrorf(err.Error()) + return logThenErrorf(err.Error()) } asset.Owner = string(recipientECertBase64) assetJSON, err := json.Marshal(asset) if err != nil { - return false, logThenErrorf(err.Error()) + return logThenErrorf(err.Error()) } - err = ctx.GetStub().PutState(getBondAssetKey(assetAgreement.AssetType, assetAgreement.Id), assetJSON) + err = ctx.GetStub().PutState(getBondAssetKey(assetType, assetId), assetJSON) if err != nil { - return false, logThenErrorf(err.Error()) + return logThenErrorf(err.Error()) } - return true, nil + return nil } func (s *SmartContract) ClaimAssetUsingContractId(ctx contractapi.TransactionContextInterface, contractId, claimInfoSerializedProto64 string) (bool, error) { diff --git a/weaver/samples/fabric/satpsimpleasset/bondasset.go b/weaver/samples/fabric/satpsimpleasset/bondasset.go index e5cb7cbf1f..f57b80e65c 100644 --- a/weaver/samples/fabric/satpsimpleasset/bondasset.go +++ b/weaver/samples/fabric/satpsimpleasset/bondasset.go @@ -125,7 +125,7 @@ func (s *SmartContract) ReadAsset(ctx contractapi.TransactionContextInterface, a // DeleteAsset deletes an given asset from the world state. func (s *SmartContract) DeleteAsset(ctx contractapi.TransactionContextInterface, assetType, id string) error { - + // Read the asset (which internally check access) asset, err := s.ReadAsset(ctx, assetType, id) if err != nil { @@ -260,7 +260,7 @@ func (s *SmartContract) UpdateMaturityDate(ctx contractapi.TransactionContextInt if err != nil { return err } - + return ctx.GetStub().PutState(getBondAssetKey(assetType, id), assetJSON) } diff --git a/weaver/samples/fabric/satpsimpleasset/go.mod b/weaver/samples/fabric/satpsimpleasset/go.mod index a5e7819bbe..6135d7ed02 100644 --- a/weaver/samples/fabric/satpsimpleasset/go.mod +++ b/weaver/samples/fabric/satpsimpleasset/go.mod @@ -7,6 +7,7 @@ require ( github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-alpha.2 github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-alpha.2 github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240513093210-cf641c80c028 + github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-alpha.2 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.0 diff --git a/weaver/samples/fabric/satpsimpleasset/go.sum b/weaver/samples/fabric/satpsimpleasset/go.sum index 39533d6ecd..0b7a6d9509 100644 --- a/weaver/samples/fabric/satpsimpleasset/go.sum +++ b/weaver/samples/fabric/satpsimpleasset/go.sum @@ -36,12 +36,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-alpha.2 h1:RCScZbqnxdX1RDrp4HATGXs8Pbh2yLI6F6ULjAjTUso= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-alpha.2/go.mod h1:3DmkYfZoc+TtcAgF3kX6CmQDNKKKCHgbaoQuYu/3ayc= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-alpha.2 h1:vF83NIQVQZWfq9WJfK2r1GZ9Db99m5l4OY4b+OzAhz8= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-alpha.2/go.mod h1:tL6FpKOJ072pXdSVb+C565NLrOEfSyrw3Tq63ftJOuY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240513093210-cf641c80c028 h1:IYGvhEekwbhhbSI9cNCcq7sdSCkEwiyRWY/Y7QCWZFs= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240513093210-cf641c80c028/go.mod h1:AM6B93C+yIr4TtjBrfnPQgkFQy0nyz3SjUYAwgQCWWc= +github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-alpha.2 h1:Z7IdcqQC6hBBGc2EvvabIBMuE1tAXawiRhX/9fNyC0A= +github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-alpha.2/go.mod h1:LPZLWY0HNjya7zz9BeRaexHolUcZO95+ycCHW7C8okA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= diff --git a/weaver/samples/fabric/simpleasset/bondasset.go b/weaver/samples/fabric/simpleasset/bondasset.go index 273273a9f7..ddbcb3a94a 100644 --- a/weaver/samples/fabric/simpleasset/bondasset.go +++ b/weaver/samples/fabric/simpleasset/bondasset.go @@ -131,7 +131,7 @@ func (s *SmartContract) ReadAsset(ctx contractapi.TransactionContextInterface, a // DeleteAsset deletes an given asset from the world state. func (s *SmartContract) DeleteAsset(ctx contractapi.TransactionContextInterface, assetType, id string) error { - + // Read the asset (which internally check access) asset, err := s.ReadAsset(ctx, assetType, id) if err != nil { diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/SatpAssetManager.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/SatpAssetManager.ts index 4d5f5ec546..34c8d6119d 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/SatpAssetManager.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/SatpAssetManager.ts @@ -12,17 +12,12 @@ import log4js from "log4js"; import * as helpers from "./helpers"; import { Contract } from "fabric-network"; -import { Hash } from "./HashFunctions" -import { createAssetExchangeAgreementSerialized, createAssetClaimInfoSerialized} from "./AssetManager" const logger = log4js.getLogger("InteroperableHelper"); - -const assignAsset = async ( +const lockAsset = async ( contract: Contract, assetType: string, assetID: string, - lockerECert: string, - hash: Hash, endorsingOrgs: Array = [] ): Promise => { @@ -41,28 +36,92 @@ const assignAsset = async ( logger.error("Asset ID not supplied"); return false; } - if (!lockerECert) + + // Normal invoke function + const tx = contract.createTransaction("LockAssetForSATP") + const ccArgs = [assetType, assetID] + if (endorsingOrgs && endorsingOrgs.length > 0) { + tx.setEndorsingOrganizations(...endorsingOrgs) + } + const [result, submitError] = await helpers.handlePromise( + tx.submit(...ccArgs) + ); + if (submitError) { + throw new Error(`LockAssetForSATP submitTransaction Error: ${submitError}`); + } + return result; +}; + +const extinguishAsset = async ( + contract: Contract, + assetType: string, + assetID: string, + endorsingOrgs: Array = [] +): Promise => { + + if (!contract) { - logger.error("Locker ECert not supplied"); + logger.error("Contract handle not supplied"); return false; } - if (!hash) + if (!assetType) { - logger.error("Instance of Hash interface not supplied") - return false + logger.error("Asset type not supplied"); + return false; } - if (!hash.preimage) + if (!assetID) { - logger.error("Hash Preimage not supplied"); + logger.error("Asset ID not supplied"); return false; } - const assetExchangeAgreementStr = createAssetExchangeAgreementSerialized(assetType, assetID, "", lockerECert); - const claimInfoStr = createAssetClaimInfoSerialized(hash); + // Normal invoke function + const tx = contract.createTransaction("DeleteAsset") + const ccArgs = [assetType, assetID] + if (endorsingOrgs && endorsingOrgs.length > 0) { + tx.setEndorsingOrganizations(...endorsingOrgs) + } + const [result, submitError] = await helpers.handlePromise( + tx.submit(...ccArgs) + ); + if (submitError) { + throw new Error(`DeleteAsset submitTransaction Error: ${submitError}`); + } + return result; +}; + +const assignAsset = async ( + contract: Contract, + assetType: string, + assetID: string, + recipientECert: string, + endorsingOrgs: Array = [] +): Promise => { + + if (!contract) + { + logger.error("Contract handle not supplied"); + return false; + } + if (!assetType) + { + logger.error("Asset type not supplied"); + return false; + } + if (!assetID) + { + logger.error("Asset ID not supplied"); + return false; + } + if (!recipientECert) + { + logger.error("Recipient ECert not supplied"); + return false; + } // Normal invoke function - const tx = contract.createTransaction("AssignAsset") - const ccArgs = [assetExchangeAgreementStr, claimInfoStr] + const tx = contract.createTransaction("AssignAssetForSATP") + const ccArgs = [assetType, assetID, recipientECert] if (endorsingOrgs && endorsingOrgs.length > 0) { tx.setEndorsingOrganizations(...endorsingOrgs) } @@ -70,11 +129,13 @@ const assignAsset = async ( tx.submit(...ccArgs) ); if (submitError) { - throw new Error(`AssignAsset submitTransaction Error: ${submitError}`); + throw new Error(`AssignAssetForSATP submitTransaction Error: ${submitError}`); } return result; }; export { - assignAsset + lockAsset, + assignAsset, + extinguishAsset, }; diff --git a/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js b/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js index f92c95497e..712846fba3 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js +++ b/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js @@ -167,7 +167,6 @@ describe("Relay", () => { localRelayEndpoint, grpc.ServerCredentials.createInsecure(), () => { - relayServer.start(); }, ); }); @@ -226,7 +225,6 @@ describe("Relay", () => { localRelayEndpoint, grpc.ServerCredentials.createInsecure(), () => { - relayServer.start(); }, ); }); @@ -291,7 +289,6 @@ describe("Relay", () => { localRelayEndpoint, grpc.ServerCredentials.createInsecure(), () => { - relayServer.start(); }, ); }); diff --git a/weaver/tests/network-setups/shared/.gitkeep b/weaver/tests/network-setups/shared/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/weaver/tests/network-setups/shared/ansible/Makefile b/weaver/tests/network-setups/shared/ansible/Makefile deleted file mode 100644 index 6d45f128f7..0000000000 --- a/weaver/tests/network-setups/shared/ansible/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -INVENTORY_FILE ?= ./inventory/ansible_provisioners - -all: setup - -.PHONY: % -%: -ifndef ENVIRONMENT_FILE - $(error Please specify the ENVIRONMENT_FILE variable to run the playbook) -endif - ansible-playbook -i $(INVENTORY_FILE) $@.yaml -e @"$(ENVIRONMENT_FILE)" - diff --git a/weaver/tests/network-setups/shared/ansible/README.md b/weaver/tests/network-setups/shared/ansible/README.md deleted file mode 100644 index b6b1240e12..0000000000 --- a/weaver/tests/network-setups/shared/ansible/README.md +++ /dev/null @@ -1,58 +0,0 @@ - -# Ansible Playbooks for Setting Up a DLT Network - -This set of playbooks are designed to manage the deployment and configuration of the DLT networks in the test environment. The playbook also take care of installing the required dependencies to interact with the test environment. -The test environment is characterised by a Kubernetes Cluster (current cloud provider supported is only OpenShift, other providers will be added as we continue to develop the playbooks). - -## Repository Content and Structure - -Content of this repository: - -- `envs` contains environment settings files for different machines (i.e. MacOS X, linux, and CI/CD). These environment files contains both common settings and what is specific to the OS/Architecture (i.e. version of binaries). -- `roles` contains all the roles that are defined in this playbook. For more details please refer to the specific README.md files for the various roles. -- `setup.yaml` main playbook to setup the test environment. -- `reset.yaml` main playbook to clean up the local environment. -- `fabric-cli.yaml` playbook to install the Hyperledger Fabric Tooling (no images). -- `openshift-cli.yaml` playbook to installn the OpenShift Container Platform CLI. -- `helm.yaml` playbook to install the helm binary. - -## Requirements - -- install Python3, pip, and Ansible -- install `ansible-lint` via `pip install ansible-lint` -- (Mac OS X Only) install `gnu-tar` via `brew tap gnu-tar` - -## Execution - -## Running the Playbook Directly - -```bash - - # Execution on Mac OS X - # - ansible-playbook -i ./inventory/ansible_provisioners -e @"envs/macosx.yaml" - - # Execution on Linux - # - ansible-playbook -i ./inventory/ansible_provisioners -e @"envs/linux.yaml" -``` - -## Running with Make - -```bash - ENVIRONMENT_FILE=envs/macosx.yaml make -``` - -Where `playbook-file-name` is one of: - -- `setup` -- `reset` -- `helm` -- `openshift-cli` -- `fabric-cli` - -If the target is not specifed, the default is `setup`. \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/envs/README.md b/weaver/tests/network-setups/shared/ansible/envs/README.md deleted file mode 100644 index f9206a023d..0000000000 --- a/weaver/tests/network-setups/shared/ansible/envs/README.md +++ /dev/null @@ -1,27 +0,0 @@ - -# Environment Files Folder - -This folder contains the variables that are used by the playbooks in this repository. - -The following playbookn variables are defined: - -| Variable Name | Description | Used By | Default Value | -|----------------------------------|-------------|---------|----------------| -| `cloud_provider` | Unique identifier of the cloud provider used to provision and operate with the cluster. | `setup.yaml` | `openshift` | -| `install_os` | Unique identifier of the operating system the ansible controller is running on. Use `darwin` for MacOS X and `linux` for Linux. | `setup.yaml` | depends on file | -| `install_arch` | Unique identifier of the architecture of the ansible controller is running on. Use `amd64` for AMD. This flag is used to retrieve the various binaries (i.e. helm) | `setup.yaml` | 'amd64' | -| `bin_install_dir` | Path to the installation directory in the ansible controller where all the binaries will be installed. | `setup.yaml` and `reset.yaml` | `~/bin` | -| `artifactory_api_key` | API Key to access the Artifactory repository to pull binaries (used to retrieve OpenShift CLI). | `setup.yaml` | maps the `ARTIFACTORY_API_KEY` environment variable. | -| `openshift_login_mode` | Name of the OpenShift project that the client will be configuring as default. | `setup.yaml` | `dlt-interop` (it can be set to "") | -| `openshift_project` | API Key used to access the configured OpenShift Cluster. | `setup.yaml` | maps the `OPENSHIFT_API_TOKEN` environment variable. | -| `openshift_api_token` | API Key used to access the configured OpenShift Cluster. | `setup.yaml` | maps the `OPENSHIFT_API_TOKEN` environment variable. | -| `openshift_api_cluster_hostname` | Hostname of the OpenShift cluster API Server. | `setup.yaml` | `api.ros2.sl.cloud9.ibm.com` | -| `openshift_api_cluster_port` | Port on the OpenShift cluster where the API Server is listening. | `setup.yaml` | `6443` | -| `openshift_api_cluster_endpoint` | Endpoint of the OpenShift cluster API server. | `setup.yaml` | composed as `https://{{hostname}}:{{port}}` with the above. | - - -__NOTE__: please ensure to setup the environment variables: `ARTIFACTORY_API_KEY` and `OPENSHFT_API_TOKEN` to the corresponding authentication tokens before running the playbooks. These are only needed by the `setup.yaml` playbook. diff --git a/weaver/tests/network-setups/shared/ansible/envs/linux.yaml b/weaver/tests/network-setups/shared/ansible/envs/linux.yaml deleted file mode 100644 index 64a0178d19..0000000000 --- a/weaver/tests/network-setups/shared/ansible/envs/linux.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -cloud_provider: "openshift" -install_os: "linux" -install_arch: "amd64" -bin_install_dir: "~/bin" -artifactory_api_key: "{{ lookup('env', 'ARTIFACTORY_API_KEY') }}" -openshift_api_token: "{{ lookup('env', 'OPENSHIFT_API_TOKEN') }}" -openshift_login_mode: "ocl" -openshift_project: "dlt-interop" -openshift_api_cluster_hostname: "ros.api.sl.cloud9.ibm.com" -openshift_api_cluster_port: 6443 -openshift_api_cluster_endpoint: "https://{{ openshift_api_cluster_hostname }}:{{ openshift_api_cluster_port }}" diff --git a/weaver/tests/network-setups/shared/ansible/envs/macosx.yaml b/weaver/tests/network-setups/shared/ansible/envs/macosx.yaml deleted file mode 100644 index 390c76b401..0000000000 --- a/weaver/tests/network-setups/shared/ansible/envs/macosx.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -cloud_provider: "openshift" -install_os: "darwin" -install_arch: "amd64" -bin_install_dir: "~/bin" -artifactory_api_key: "{{ lookup('env', 'ARTIFACTORY_API_KEY') }}" -openshift_login_mode: "ocl" -openshift_project: "dlt-interop" -openshift_api_token: "{{ lookup('env', 'OPENSHIFT_API_TOKEN') }}" -openshift_api_cluster_hostname: "ros.api.sl.cloud9.ibm.com" -openshift_api_cluster_port: 6443 -openshift_api_cluster_endpoint: "https://{{ openshift_api_cluster_hostname }}:{{ openshift_api_cluster_port }}" diff --git a/weaver/tests/network-setups/shared/ansible/fabric-cli.yaml b/weaver/tests/network-setups/shared/ansible/fabric-cli.yaml deleted file mode 100644 index a54d9becd4..0000000000 --- a/weaver/tests/network-setups/shared/ansible/fabric-cli.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -# This playbook sets up the environment to enable -# the deployment of the networks. - -- hosts: ansible_provisioners - gather_facts: yes - tasks: - - - include_role: - name: setup/hyperledger-fabric-cli - vars: - fabric_cli: - bin_directory: "{{ bin_install_dir }}/hlf" - version: "2.1.1" - os: "darwin" - arch: "amd64" - ca: - version: "1.4.8" - bin_directory: "{{ bin_install_dir }}/hlf-ca" - - vars: # These variables can be overriden from the command line - privilege_escalate: false # Default to NOT escalate to root privledges - - # cloud_provider: # to be provided via environment - # bin_install_dir: # to be provided via environment \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/helm.yaml b/weaver/tests/network-setups/shared/ansible/helm.yaml deleted file mode 100644 index 5fd3acf7df..0000000000 --- a/weaver/tests/network-setups/shared/ansible/helm.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -# This playbook sets up the environment to enable -# the deployment of the networks. - -- hosts: ansible_provisioners - gather_facts: yes - tasks: - - - include_role: - name: setup/helm - vars: - helm: - version: "v3.3.0-rc.2" - os: "{{ install_os }}" - arch: "{{ install_arch }}" - bin_directory: "{{ bin_install_dir }}/helm" - checksum: "" - - vars: # These variables can be overriden from the command line - privilege_escalate: false # Default to NOT escalate to root privledges - - # cloud_provider: # to be provided via environment - # bin_install_dir: # to be provided via environment \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/inventory/ansible_provisioners b/weaver/tests/network-setups/shared/ansible/inventory/ansible_provisioners deleted file mode 100644 index 213757d40d..0000000000 --- a/weaver/tests/network-setups/shared/ansible/inventory/ansible_provisioners +++ /dev/null @@ -1,6 +0,0 @@ -[ansible_provisioners:children] -local - -[local] -localhost ansible_connection=local - diff --git a/weaver/tests/network-setups/shared/ansible/openshift-cli.yaml b/weaver/tests/network-setups/shared/ansible/openshift-cli.yaml deleted file mode 100644 index 2e963ae5dd..0000000000 --- a/weaver/tests/network-setups/shared/ansible/openshift-cli.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -# This playbook sets up the environment to enable -# the deployment of the networks. - -- hosts: ansible_provisioners - gather_facts: yes - tasks: - - - include_role: - name: setup/openshift-cli - vars: - openshift_cli: - os: "{{ install_os }}" - bin_directory: "{{ bin_install_dir }}/oc" - repository: - url: "https://na.artifactory.swg-devops.com/artifactory/res-dlt-interop-generic-local" - api_key: "{{ artifactory_api_key }}" - api: - token: "{{ openshift_api_token }}" - cluster_hostname: "{{ openshift_api_cluster_hostname }}" - cluster_endpoint: "{{ openshift_api_cluster_endpoint }}" - login_mode: "{{ openshift_login_mode }}" # Use 'oc' to directly use the oc command line tool, 'ocl' to use the shell script, 'none' to avoid login. - project: "{{ openshift_project }}" - checksum: "" - when: cloud_provider is defined and cloud_provider == "openshift" - - - vars: # These variables can be overriden from the command line - privilege_escalate: false # Default to NOT escalate to root privledges - - # install_os: # to be provided via environment - # bin_install_dir: # to be provided via environment - # cloud_provider: # to be provided via environment - # artifactory_api_key: # to be provided via environment - # openshift_api_token: # to be provided via environment - # openshift_api_cluster_hostname # to be provided via environment - # openshift_api_cluster_endpoint # to be provided via environment - # openshift_login_mode # to be provided via environment - # openshift_project # to be provided via environment - diff --git a/weaver/tests/network-setups/shared/ansible/reset.yaml b/weaver/tests/network-setups/shared/ansible/reset.yaml deleted file mode 100644 index 4dc3bfbac7..0000000000 --- a/weaver/tests/network-setups/shared/ansible/reset.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -# This playbook sets up the environment to enable -# the deployment of the networks. - -- hosts: ansible_provisioners - gather_facts: yes - tasks: - - - include_role: - name: remove/openshift-cli - vars: - openshift_cli: - bin_directory: "{{ bin_install_dir }}/oc" - when: cloud_provider is defined and cloud_provider == "openshift" - - - include_role: - name: remove/helm - vars: - helm: - bin_directory: "{{ bin_install_dir }}/helm" - - vars: # These variables can be overriden from the command line - privilege_escalate: false # Default to NOT escalate to root privledges - - # cloud_provider: # to be provided via environment - # bin_install_dir: # to be provided via environment - - diff --git a/weaver/tests/network-setups/shared/ansible/roles/README.md b/weaver/tests/network-setups/shared/ansible/roles/README.md deleted file mode 100644 index 70cc242b64..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/README.md +++ /dev/null @@ -1,23 +0,0 @@ - -# Ansible Roles Main Folder - -This folder contains the Ansible roles used by the playbook. The roles are organised based on the type of activities that they perform: - -- `setup`: contains all the roles for setting up dependencies and tooling. -- `remove`: contains all the roles for removing installed dependencies and tooling. -- `check`: contains all the roles for verifying various prerequisites. - -Current roles: - -- `check/setup`: checks prerequisites. -- `setup/helm`: sets up Helm in the Ansible controller. -- `setup/openshift-cli`: sets up the OpenShift Container Platform CLI in the Ansible controller. -- `remove/helm`: removes the Helm installation in the Ansible controller. -- `remove/openshift-cli`: removes the OpenShift Container Platform CLI installation from the Ansible controller. - -Please refer to the README.md files of each of the roles to understand in detail their use and function. - diff --git a/weaver/tests/network-setups/shared/ansible/roles/check/setup/README.md b/weaver/tests/network-setups/shared/ansible/roles/check/setup/README.md deleted file mode 100644 index be724bcdaa..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/check/setup/README.md +++ /dev/null @@ -1,19 +0,0 @@ - -# Ansible Roles for Verification of the Setup - -This folder contains the definition of the tasks that are used to verify the installation and the directory structure of the setup. - -At present time, the tasks defined perform the following function: - -- verification of the installation path existence -- creation (if not present) of the installation root path - -The tasks are parameterised with the `path` that needs to be supplied when using the tasks. - - - - diff --git a/weaver/tests/network-setups/shared/ansible/roles/check/setup/tasks/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/check/setup/tasks/main.yaml deleted file mode 100644 index a97d1e54d7..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/check/setup/tasks/main.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - - ---- -# This tasks ensures the directory existance and registers the result essential for idempotence test -- name: Check if directory exists - stat: - path: "{{ path }}" - register: dir_check - when: check == "ensure_dir" - -# Check if directory is created -# This task creates the directory -- name: Ensures directory exists - file: - path: "{{ path }}" - recurse: yes - mode: '0755' - state: directory - when: check == "ensure_dir" and (not dir_check.stat.exists) diff --git a/weaver/tests/network-setups/shared/ansible/roles/remove/helm/README.md b/weaver/tests/network-setups/shared/ansible/roles/remove/helm/README.md deleted file mode 100644 index 6bdab9a5f9..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/remove/helm/README.md +++ /dev/null @@ -1,14 +0,0 @@ - -# Ansible Role for Helm Binary Removal - -This role contains the tasks used to remove the installation of the Helm binary. The tasks are all defined in the `tasks/main.yaml` file, which consumes the variables defined in `vars/main.yaml`. These are the variable currently supported: - -- `helm.bin_directory` : installation path for the Helm binary and associated scripts. - -## Running The Role as Part of a Playbook - -__NOTE__: When this role is imported into a playbook that specifies an environment file or that customises the inclusion through a `vars` dictionary, the resulting configuration for the role heavily depends on the configured behaviour of the Ansible controller. In particular, the setup defined for the `hash_behaviour` property. By default this is set to `replace` rather than `merge`. This causes the `openshift_cli` dictionary defined in the `vars` folder to be completely replaced rather than merged. Please ensure that all the entries of the dictionary are then defined in the `vars` section of the include or in the environment file. See: [Ansible - Importing Variables](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) diff --git a/weaver/tests/network-setups/shared/ansible/roles/remove/helm/tasks/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/remove/helm/tasks/main.yaml deleted file mode 100644 index 6cf86d4863..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/remove/helm/tasks/main.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - - name: Remove Helm installation - file: - path: "{{ helm.bin_directory }}" - state: absent - tags: - - helm diff --git a/weaver/tests/network-setups/shared/ansible/roles/remove/helm/vars/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/remove/helm/vars/main.yaml deleted file mode 100644 index 2d3dd36e6a..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/remove/helm/vars/main.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - -helm: - bin_directory: "~/bin/helm" diff --git a/weaver/tests/network-setups/shared/ansible/roles/remove/hyperledger-fabric-cli/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/remove/hyperledger-fabric-cli/main.yaml deleted file mode 100644 index 9d1caee752..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/remove/hyperledger-fabric-cli/main.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - - name: Remove Hyperleder Fabric CLI Installation - file: - path: "{{ fabric-cli.bin_directory }}" - state: absent - tags: - - fabric_cli - - - name: Remove Hyperleder Fabric CA CLI Installation - file: - path: "{{ fabric-cli.ca.bin_directory }}" - state: absent - tags: - - fabric_cli \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/README.md b/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/README.md deleted file mode 100644 index fd4e0461da..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/README.md +++ /dev/null @@ -1,14 +0,0 @@ - -# Ansible Role for OpenShift Container Plaform CLI Binary Removal - -This role contains the tasks used to remove the installation of the OpenShift CLI binary. The tasks are all defined in the `tasks/main.yaml` file, which consumes the variables defined in `vars/main.yaml`. These are the variable currently supported: - -- `openshift_cli.bin_directory` : installation path for the OpenShift CLI binary and associated scripts. - -## Running The Role as Part of a Playbook - -__NOTE__: When this role is imported into a playbook that specifies an environment file or that customises the inclusion through a `vars` dictionary, the resulting configuration for the role heavily depends on the configured behaviour of the Ansible controller. In particular, the setup defined for the `hash_behaviour` property. By default this is set to `replace` rather than `merge`. This causes the `openshift_cli` dictionary defined in the `vars` folder to be completely replaced rather than merged. Please ensure that all the entries of the dictionary are then defined in the `vars` section of the include or in the environment file. See: [Ansible - Importing Variables](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) diff --git a/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/tasks/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/tasks/main.yaml deleted file mode 100644 index 770a865d5a..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/tasks/main.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - - name: Remove OpenShift CLI installation - file: - path: "{{ openshift_cli.bin_directory }}" - state: absent - tags: - - openshift_cli - diff --git a/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/vars/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/vars/main.yaml deleted file mode 100644 index a75be112bd..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/remove/openshift-cli/vars/main.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - -openshift_cli: - bin_directory: "~/bin/oc" - - - diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/helm/README.md b/weaver/tests/network-setups/shared/ansible/roles/setup/helm/README.md deleted file mode 100644 index 009868399c..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/helm/README.md +++ /dev/null @@ -1,28 +0,0 @@ - -# Ansible Role for the Installation of the Helm Binary - -This folder contains the definition of the setup for the Helm binary (i.e. `helm`). This role defines a set of tasks that perform the following activities: - -- verification of the local installation of the Helm binary -- download of the binary package if not present from the configured Helm website -- unpacking and installation of the package in the designated installation directory -- verification of the installation package after download - -The tasks are all defined in the `tasks/main.yaml` file, which consumes the variables defined in `vars/main.yaml`. These are the variable currently supported: - -- `tmp_directory`: root path to the temp directory folder as specifed by the OS (this is retrieved via a `lookup('env', 'TMPDIR') | default('/tmp')`). -- `helm.os`: operating system family of the machine where the Ansible Controller (i.e. `darwin` for MacOS X and `linux` for Linux boxes). -- `helm.arch` : operating system architecture of the machine where the Ansible Controller is running. -- `helm.version` : selected version of the Helm binary to downlaod. -- `helm.bin_directory` : installation path for the Helm binary and associated scripts. -- `helm.checksum` : checksum of the installation package file used for the purpose of verification. - -To specify the values for the helm dictionary please refer to: [Helm Releases](https://github.com/helm/helm/releases). The resulting file name is composed by using version, os, and architecture. - -## Running The Role as Part of a Playbook - -__NOTE__: When this role is imported into a playbook that specifies an environment file or that customises the inclusion through a `vars` dictionary, the resulting configuration for the role heavily depends on the configured behaviour of the Ansible controller. In particular, the setup defined for the `hash_behaviour` property. By default this is set to `replace` rather than `merge`. This causes the `openshift_cli` dictionary defined in the `vars` folder to be completely replaced rather than merged. Please ensure that all the entries of the dictionary are then defined in the `vars` section of the include or in the environment file. See: [Ansible - Importing Variables](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/helm/tasks/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/helm/tasks/main.yaml deleted file mode 100644 index 7ebf785db6..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/helm/tasks/main.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - - name: Ensure Helm Installation - include_role: - name: setup/simple-package - vars: - package: - name: "Helm" - install_path: "{{ helm.bin_directory }}" - url: "https://get.helm.sh/helm-{{ helm.version }}-{{ helm.os }}-{{ helm.arch }}.tar.gz" - unpack: True - command: "{{ helm.bin_directory }}/helm version --client --short" - cache: True - archive_path: "{{ helm.os }}-{{ helm.arch }}/" - tags: - - helm - - \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/helm/vars/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/helm/vars/main.yaml deleted file mode 100644 index 13c2c4fe21..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/helm/vars/main.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -helm: - version: "v2.14.1" - os: "darwin" # use "darwin" for MacOS X, "windows" for Windows, "linux" for Linux - arch: "amd64" # other possible values: "386","arm64","arm","ppc64le","s390x" - bin_directory: "~/bin/helm" - checksum: "" diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/README.md b/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/README.md deleted file mode 100644 index 583a9d2fa4..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/README.md +++ /dev/null @@ -1,58 +0,0 @@ - -# Ansible Role for the Installation of Hyperledger Fabric Tooling - -This role downloads and install the Hyperledger Fabric tools into the host. The package relies upon the services provided by the role `setup/simple-package` to download and install the archives required for the installation. These are: - -- `hyperledger-fabric-{{ os }}-{{ arch }}-{{ version }}.tar.gz` for the general Fabric tooling. -- `hyperledger-fabric-ca-{{ os }}-{{ arch }}-{{ version }}.tar.gz` for the Fabric CA related tooling. - -These packages are retrieved from the corresponding releases in the associated GitHub repositories. - -## Behaviour - -The role includes `roles/setup/simple-package` to install both packages. Please refer to the documentation of the role for further details of the download and installation behaviour. - -## Configuration - -The activities of the role are controlled by the parameters supplied via the `fabric_cli` dictionary: - -- `fabric_cli.os` : (required) operating system identifier of the host (i.e. `linux`, `darwin`, ...) -- `fabric_cli.arch`: (required) cpu architecture of the host (i.e. `amd64`, ...) -- `fabric_cli.bin_directory`: (required) path to the installation location of the Hyperledger Fabric CLI in the host. -- `fabric_cli.version`: (required) version of the Hyperledger Fabric CLI to install. -- `fabric_cli.ca.bin_directory`: (required) path to the installation location of the Hyperledger Fabric CA CLI in the host. -- `fabric_cli.ca.version`: (required) version of the Hyperledger Fabric CA CLI to install. - -The two packages (Hyperledger Fabric and Hyperledger Fabric Ca) can be customised differently in terms of instaltion directory and version to install. The architecture and the operating system are the same. - -### Default Settings - -The `defaults/main.yaml` contains the default settings for the various url's that the role relies upon for downloading the packages. These are shown below. The `hlf_github_release_url` and `hlf_ca_github_release_url` are completed with the specification of the relative path of the specific the package to download based on version, operating system, and archictecture. - -```yaml -hlf_github: "https://github.com/hyperledger" -hlf_github_releases_url: "{{ hlf_github }}/fabric/releases/download" -hlf_ca_github_releases_url: "{{ hlf_github }}/fabric-ca/releases/download" -``` - -### Derived Settings - -The `vars/main.yaml` contains the settings that are derived by the role based on the supplied setting and the default settings. These variables store the information about the full URLs to both the Hyperledger Fabric and the Hyperledger Fabric CA packages. - -```yaml -hlf_package_url: ...... -hlf_ca_package_url: ..... -``` - -There is no need to change these parameters as they are automatically resolved. - -## Running The Role as Part of a Playbook - -__NOTE__: When this role is imported into a playbook that specifies an environment file or that customises the inclusion through a `vars` dictionary, the resulting configuration for the role heavily depends on the configured behaviour of the Ansible controller. In particular, the setup defined for the `hash_behaviour` property. By default this is set to `replace` rather than `merge`. This causes the `openshift_cli` dictionary defined in the `vars` folder to be completely replaced rather than merged. Please ensure that all the entries of the dictionary are then defined in the `vars` section of the include or in the environment file. See: [Ansible - Importing Variables](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) - - - diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/defaults/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/defaults/main.yaml deleted file mode 100644 index d5cd937af9..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/defaults/main.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -hlf_github: "https://github.com/hyperledger" -hlf_github_releases_url: "{{ hlf_github }}/fabric/releases/download" -hlf_ca_github_releases_url: "{{ hlf_github }}/fabric-ca/releases/download" \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/tasks/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/tasks/main.yaml deleted file mode 100644 index bc53f887c6..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/tasks/main.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - - name: Ensure Hyperledger Fabric {{ fabric_cli.version }} Tooling Installation - include_role: - name: setup/simple-package - vars: - package: - name: "Hyperledger Fabric Tooling" - install_path: "{{ fabric_cli.bin_directory }}" - url: "{{ hlf_package_url }}" - unpack: True - command: "{{ fabric_cli.bin_directory }}/bin/configtxgen -version" - cache_remove: False - cache_refresh: False - tags: - - fabric_cli - - - name: Ensure Hyperledger Fabric CA {{ fabric_cli.ca.version }} Installation - include_role: - name: setup/simple-package - vars: - package: - name: "Hyperledger Fabric CA Tooling" - install_path: "{{ fabric_cli.ca.bin_directory }}" - url: "{{ hlf_ca_package_url }}" - unpack: True - command: "{{ fabric_cli.ca.bin_directory }}/bin/fabric-ca-client version" - cache_refresh: False - cache_remove: False - tags: - - fabric_cli diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/vars/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/vars/main.yaml deleted file mode 100644 index 154fc404e4..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/hyperledger-fabric-cli/vars/main.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# These variable resolve the full URLs to the two packages to download based on -# the default settings and the specification of architecture, version, and operating -# system supplied. -# -hlf_package_url: "{{ hlf_github_releases_url }}/v{{ fabric_cli.version }}/hyperledger-fabric-{{ fabric_cli.os }}-{{ fabric_cli.arch }}-{{ fabric_cli.version }}.tar.gz" -hlf_ca_package_url: "{{ hlf_github_releases_url }}/v{{ fabric_cli.ca.version }}/hyperledger-fabric-ca-{{ fabric_cli.os }}-{{ fabric_cli.arch }}-{{ fabric_cli.ca.version }}.tar.gz" \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/README.md b/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/README.md deleted file mode 100644 index acd7d9a977..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/README.md +++ /dev/null @@ -1,38 +0,0 @@ - -# Ansible Role for OpenShift Container Platform CLI Setup - -This folder contains the definition of the setup fole for the OpenShift CLI (i.e. `oc`). This role defines a set of tasks that perform the following activities: - -- verification of the local installation of the CLI -- download of the CLI package if not present from the configured binary repository (i.e. Artifactory) -- unpacking and installation of the CLI package in the designated installation directory -- verification of the installation package after download -- login of the CLI into the specified cluster (if required) -- selection of the default project (if required) - -The tasks are all defined in the `tasks/main.yaml` file, which consumes the variables defined in `vars/main.yaml`. These are the variable currently supported: - -- `tmp_directory`: root path to the temp directory folder as specifed by the OS (this is retrieved via a `lookup('env', 'TMPDIR') | default('/tmp')`). -- `openshift_cli.os`: operating system family of the Ansible Controller (i.e. `darwin` for MacOS X and `linux` for Linux boxes). -- `openshift_cli.project` : default project to select (i.e. kubernetes namespace) after logging in. -- `openfhift_cli.login_mode` : selected mode for login (i.e. `oc` for using directly the oc client, `ocl` for using the ocl.sh script, `none` for avoiding login). -- `openshift_cli.bin_directory` : installation path for the client binary and associated scripts. -- `openshift_cli.repository.url` : url to the repository that contains the package distribution for the OpenShift Container Platform CLI and associated tooling. -- `openshift_cli.reposittory.api_key` : API key to use to perform authentication against the binary repository. -- `openshift_cli.api.token` : API Key to use to perform authentication against the OpenShift cluster API server. -- `openshift_cli.api.cluster_hostname` : Hostanme of the host where the OpenShift cluster API server is running on. -- `openshift_cli.api.cluster_endpoint` : Endpoint where the OpenShift cluster API server is listening on. - - -## Login Modes - -This playbook implements different login modes to cater for IP resolution issues experienced in some environments when running directly through the `oc` binary. In some cases, the binary is not able to resolve the IP address of the API server given its hostname because of misconfiguration of the DNS. In that case, the script `ocl.sh` pre-fetches the IP given the hostname and replaces the endpoint provided in the configuration with an dynamic endpoint that is composed by using the IP and the form: `https://{{IP}}:6443`. Future versions of the script will also incorporate the management of a custom port. - - -## Running The Role as Part of a Playbook - -__NOTE__: When this role is imported into a playbook that specifies an environment file or that customises the inclusion through a `vars` dictionary, the resulting configuration for the role heavily depends on the configured behaviour of the Ansible controller. In particular, the setup defined for the `hash_behaviour` property. By default this is set to `replace` rather than `merge`. This causes the `openshift_cli` dictionary defined in the `vars` folder to be completely replaced rather than merged. Please ensure that all the entries of the dictionary are then defined in the `vars` section of the include or in the environment file. See: [Ansible - Importing Variables](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/tasks/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/tasks/main.yaml deleted file mode 100644 index a4462d7207..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/tasks/main.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - - name: Ensure OpenShift Container Platform CLI Installation - include_role: - name: setup/simple-package - vars: - package: - name: "OpenShift Container Platform CLI" - install_path: "{{ openshift_cli.bin_directory }}" - url: "{{ openshift_cli.repository.url }}/openshift/cli/{{ openshift_cli.os }}/oc.tar.gz" - headers: - "X-JFrog-Art-Api": "{{ openshift_cli.repository.api_key }}" - unpack: True - command: "{{ openshift_cli.bin_directory }}/oc -h" - cache_refresh: False - cache_remove: False - tags: - - openshift_cli - - - - name: "Login into OpenShift Cluster (login_mode: OC)" - shell: - chdir: "{{ openshift_cli.bin_directory }}" - cmd: "./oc --token={{ openshift_cli.api.token }} --server={{ openshift_cli.api.cluster_endpoint }}" - when: openshift_cli.login_mode == "oc" - tags: - - openshift_cli - - - name: "Login into OpenShift Cluster (login_mode: OCL)" - shell: - chdir: "{{ openshift_cli.bin_directory }}" - cmd: "OPENSHIFT_CLUSTER_API={{ openshift_cli.api.cluster_hostname }} OPENSHIFT_TOKEN={{ openshift_cli.api.token }} ./ocl.sh" - when: openshift_cli.login_mode == "ocl" - tags: - - openshift_cli - - - name: Selecting Default Project - command: "{{ openshift_cli.bin_directory }}/oc project {{ openshift_cli.project }}" - when: > - openshift_cli.project is defined and - (openshift_cli.project | length > 0) and - openshift_cli.login_mode != "none" diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/vars/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/vars/main.yaml deleted file mode 100644 index 2859ed4eae..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/openshift-cli/vars/main.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -tmp_directory: "{{ lookup('env', 'TMPDIR') | default('/tmp', true) }}" - -openshift_cli: - os: "darwin" # Use 'darwin' for MacOS X, 'linux' for Linux - bin_directory: "~/bin/oc" - project: "" - login_mode: "oc" - repository: - url: "https://na.artifactory.swg-devops.com/artifactory/aur-generic-local" - api_key: "{{ lookup('env', 'OPENSHIFT_BINARY_REPOSITORY_API_KEY') }}" - api: - token: "{{ lookup('env', 'OPENSHIFT_TOKEN') }}" - cluster_hostname: "" - cluster_endpoint: "" - - - diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/README.md b/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/README.md deleted file mode 100644 index 50bd6c1f19..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/README.md +++ /dev/null @@ -1,75 +0,0 @@ - -# Ansible Role for Download and Installation of Simple Packages - -This Ansible role facilitate the implementation of other tasks that naturally require the installation of one of more file in a single rooted directory structure. - -## Behaviour - -The main logic of the role is implemented in `tasks/main.yaml`, and performs the following operations: - -- it checks whether the package is already installed -- it downloads the package from a remote url (if not locally cached) -- it unpacks the package if needed into a temporary folder (optional) -- it moves the content of the package to the designated install path -- it verifies the content of the of the package with a custom command (optional) -- it updates the package cache based on the cache behaviour for the package. - -## Configuration - -The role require the definition of the following parameters to perform the installation of the package. These are to be provided by th invocation context of the role: - -- `package.name` : (required) name of the package being installed. -- `package.install_path` : (required) location where the package is to be installed. -- `package.url` : (required) remote url where to download the package from. -- `package.headers` : (optional, default: {}) a dictionary containing the headers to supply when downloading the package. -- `package.unpack` : (required) determines whether the remote package needs to be unpacked. -- `package.command` : (optional) command to be execute to verify the correct installation. -- `package.cache_refresh` : (optional, default: False) determines whether we should force the cache refresh. -- `package.cache_remove` : (optional, default: False) determines whether the package should be cached. -- `package.archive_path` : (optional, default: '') determines the sub-path within the unpack folder to copy into the installation path. - -### Default Settings - -The default settings are store in the `defaults/main.yaml` file and at present time they only comprise of these parameters: - -```yaml -simple_package_cache_path: ~/.simple-package/cache/ -simple_package_metadata_file: package.yaml -simple_package_unpack_directory: unpack/ -simple_package_download_directory: download/ -``` - -This parameter control the location of the package cache and its sub-paths. These are usually host wide settings and it is not neccessary to change them per host. - -### Additional (Derived) Settings - -For the purpose of file system management the role relies upon additional variables which are derived both by the default settings and the `package` dictionary supplied during invocation. These are defined in the `vars/main.yaml` and control the internal sub-path of the cache that are used to download and install the package: - -```yaml -package_cache_key: "{{ package.url | hash('md5') }}" -package_cache_directory: "{{ simple_package_cache_path }}{{ package_cache_key }}/" -package_cache_metadata_path: "{{ package_cache_directory }}{{ simple_package_metadata_file }}" -package_cache_unpack_directory: "{{ package_cache_directory }}{{ simple_package_unpack_directory }}" -package_cache_unpack_path: "{{ package_cache_unpack_directory }}{{ package.archive_path | default('') }}" -package_cache_download_directory: "{{ package_cache_directory }}{{ simple_package_download_directory }}" -package_cache_download_file: "{{ package_cache_download_directory }}{{ package.url | basename }}" -``` - -As happens for the default settings there is no need to change these variables as these are updated automatically by the role: - -- `package_cache_key`: unique identifier for the package in the cache, this is derived from the package download url which is hashed via md5. -- `package_cache_directory`: the directory in the host where the package cache for the packacge being installed is located. -- `package_cache_unpack_directory`: the full path to the unpack location where the package is unpacked before being installed in the final location, if the `package.unpack` flag is set to `True`. -- `package_cache_metadata_path`: location of the metadata file that contains the information about the instsalled package. -- `package_cache_unpack_path`: the full path to the portion of the file system to copy in the installation directory. This may coincide with the value of `package_cache_unpack_directory` if `package.archive_path` is not defined or an empty string. -- `package_cache_download_directory`: the full path to the downlaod directory where the package is saved when remotelyb downloaded from the specified url. -- `package_cache_download_file`: the full path to the file that represents the downloaded package. This is the file being copied into the installation path if the package does not require unpacking (i.e. `package.unpack` is `False`). - - -## Running The Role as Part of a Playbook - -__NOTE__: When this role is imported into a playbook that specifies an environment file or that customises the inclusion through a `vars` dictionary, the resulting configuration for the role heavily depends on the configured behaviour of the Ansible controller. In particular, the setup defined for the `hash_behaviour` property. By default this is set to `replace` rather than `merge`. This causes the `package` dictionary defined in the `vars` folder to be completely replaced rather than merged. Please ensure that all the entries of the dictionary are then defined in the `vars` section of the include or in the environment file. See: [Ansible - Importing Variables](https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable) diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/defaults/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/defaults/main.yaml deleted file mode 100644 index 475802d12f..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/defaults/main.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# This file contains the default settings for the role. -# The variables defined here are applied to all executions of -# the tasks and are not meant to be changed, as they are more -# of system wide settings for the role. -# -simple_package_cache_path: ~/.simple-package/cache/ -simple_package_metadata_file: package.yaml -simple_package_unpack_directory: unpack/ -simple_package_download_directory: download/ diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/tasks/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/tasks/main.yaml deleted file mode 100644 index 5a292b1fb1..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/tasks/main.yaml +++ /dev/null @@ -1,200 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- - # This task provides an overview of the information that will be - # used to download and install the package specified in the - # variables passed to it. - # - - name: Initialize Package - vars: - msg: | - Package Name: {{ package.name }} - Package Key: {{ package_cache_key }} - Package Cache Root: {{ package_cache_directory }} - Package Download Root: {{ package_cache_download_directory }} - Package Download File: {{ package_cache_download_file }} - Package Unpack Root: {{ package_cache_unpack_directory }} - Package Unpack Path: {{ package_cache_unpack_path }} - debug: - msg: "{{ msg.split('\n') }}" - tags: - - simple_package - - # This tasks determine whether the package is already installed. - # If that is the case, then we do not do any other task, except - # for verifying the installation. - # - - name: "Check Package Installation" - stat: - path: "{{ package.install_path }}" - register: package_path - tags: - - simple_package - - # This task determines the location of the package download - # folder in the cache. It is used as a temporary folder were - # the binary is stored and unpacked if needed. The task register - # an array of stat results: - # - the first is the download directory - # - the second is the __unpack__ directory - # - - name: "Configure Package Cache Locations" - file: - path: "{{ item }}" - state: directory - with_items: - - "{{ package_cache_download_directory }}" - - "{{ package_cache_unpack_directory }}" - when: not package_path.stat.exists - tags: - - simple_package - - - # This task ensures that the cache is refreshed, forcing the - # download of the package again from the remote url. - # - - name: "Clearing Cache (cache_refresh=True)" - file: - path: "{{ package_cache_directory }}" - state: absent - when: > - not package_path.stat.exists - and (package.cache_refresh is defined and package.cache_refresh) - - - # This task execute the file system stat operation to gather - # information about the locations that are required for the - # download and installation of the package. Essentially it - # exposes the paths as file system entities that can be queried - # to obtain information about their existence. - # - - name: "Register Package Cache Locations" - stat: - path: "{{ item }}" - register: package_cache_locations - with_items: - - "{{ package_cache_metadata_path }}" - - "{{ package_cache_download_directory }}" - - "{{ package_cache_download_file }}" - - "{{ package_cache_unpack_directory }}" - when: not package_path.stat.exists - tags: - - simple_package - - # This task downloads the package that is available at package URL and - # it is only executed when the file is not already present in the download - # cache. - # - - name: "Download Package" - get_url: - url: "{{ package.url }}" - dest: "{{ package_cache_download_file }}" - headers: "{{ package.headers | default({}) }}" - register: package_download - when: > - not package_path.stat.exists - and not package_cache_locations.results[3].stat.exists - tags: - - simple_package - - # This task determines whether the package has alread been downloaded - # and present in the download cache. This is operation is implemented - # by performing a stat on the path where it is expected to be found - # in the download cache. - # - - name: "Checking Downloaded Package" - stat: - path: "{{ package_cache_download_file }}" - register: package_download_file - when: not package_path.stat.exists - tags: - - simple_package - - # This tasks updates the package metadata in the cache. The tasks - # writes a simple file that contains information about the package - # downloaded and installed. - # - - name: "Update Package Metadata" - blockinfile: - path: "{{ package_cache_metadata_path }}" - create: yes - block: | - name: "{{ package.name }}" - key: "{{ package_cache_key }}" - url: "{{ package.url }}" - install_path: "{{ package.install_path }}" - unpack: "{{ package.unpack }}" - command: "{{ package.command | default('') }}" - archive_path: "{{ package.archive_path | default('') }}" - size: "{{ package_download_file.stat.size }} ({{ package_download_file.stat.size | human_readable }})" - update: "{{ package_download_file.stat.ctime }}" - when: > - not package_path.stat.exists - and package_download.changed - tags: - - simple_package - - # This task explodes the downloaded package if needed. It is triggered if - # the package.unpack flag is set to true, and it will be exploding the - # archive in the preconfigured path in the download cache. - # - - name: Explode the Archive - unarchive: - src: "{{ package_cache_download_file }}" - dest: "{{ package_cache_unpack_directory }}" - remote_src: yes - register: package_unpack - when: > - package.unpack - and (not package_path.stat.exists or package_download.changed) - tags: - - simple_package - - # This task copies the binaries into the designated installation folder. - # The tasks selects the source of files to copy based on whether the - # package.unpack is set to true or false: - # - package.unpack=True then the source folder is the unpack folder. - # - package.unpack=False then the source folder is the download folder. - # - - name: Copy Binaries into Installation Location - copy: - src: "{{ package_cache_unpack_path if package.unpack else package_cache_download_file }}" - dest: "{{ package.install_path }}" - mode: "0755" - when: > - not package_path.stat.exists - or package_unpack.changed - tags: - - simple_package - - # This task verifies the installation of the package by executing the - # command that has been specified in the package.command parameter if - # any, otherwise it skips the execution. - # - - name: Verify Installation Location - command: "{{ package.command }}" - changed_when: false - when: > - package.command is defined and - package.command | length > 0 - tags: - - simple_package - - molecule-idempotence-notest - - # This tasks removes any information associated to the package from the - # download cache. It is only executed if the value of package.cache is - # set to False. - # - - name: Remove Package Cache Location - file: - path: "{{ package_cache_directory }}" - state: absent - when: package.cache_remove is defined and package.cache_remove - tags: - - simple_package - - diff --git a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/vars/main.yaml b/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/vars/main.yaml deleted file mode 100644 index 663ba3ab3c..0000000000 --- a/weaver/tests/network-setups/shared/ansible/roles/setup/simple-package/vars/main.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# This file contains the variables that are derived from the current configuration -# parameters of the task and the defaults set in ../defaults/main.yaml. These are -# essentially short-hands for file system locations that are internally managed by -# the package to perform downloads, archive decompression, and installation. -# -package_cache_key: "{{ package.url | hash('md5') }}" -package_cache_directory: "{{ simple_package_cache_path }}{{ package_cache_key }}/" -package_cache_metadata_path: "{{ package_cache_directory }}{{ simple_package_metadata_file }}" -package_cache_unpack_directory: "{{ package_cache_directory }}{{ simple_package_unpack_directory }}" -package_cache_unpack_path: "{{ package_cache_unpack_directory }}{{ package.archive_path | default('') }}" -package_cache_download_directory: "{{ package_cache_directory }}{{ simple_package_download_directory }}" -package_cache_download_file: "{{ package_cache_download_directory }}{{ package.url | basename }}" \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/ansible/setup.yaml b/weaver/tests/network-setups/shared/ansible/setup.yaml deleted file mode 100644 index 3e316e68a4..0000000000 --- a/weaver/tests/network-setups/shared/ansible/setup.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -# This playbook sets up the environment to enable -# the deployment of the networks. - -- import_playbook: openshift-cli.yaml -- import_playbook: helm.yaml -- import_playbook: fabric-cli.yaml - - diff --git a/weaver/tests/network-setups/shared/ansible/test.yaml b/weaver/tests/network-setups/shared/ansible/test.yaml deleted file mode 100644 index 7357fbe514..0000000000 --- a/weaver/tests/network-setups/shared/ansible/test.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -# This playbook sets up the environment to enable -# the deployment of the networks. - -- hosts: ansible_provisioners - gather_facts: yes - tasks: - - - name: "Retrieve file" - get_url: - url: https://get.helm.sh/helm-{{ helm.version }}-{{ helm.os }}-{{ helm.arch }}.tar.gz - dest: /tmp/helm.tar.gz - headers: "{{ helm.headers | default({}) }}" - vars: - helm: - version: "v3.3.0-rc.2" - os: "darwin" - arch: "amd64" - headers: - "X-API-Key" : "Awjhppp" - - vars: # These variables can be overriden from the command line - privilege_escalate: false # Default to NOT escalate to root privledges - - # cloud_provider: # to be provided via environment - # bin_install_dir: # to be provided via environment diff --git a/weaver/tests/network-setups/shared/artifactory.properties.template b/weaver/tests/network-setups/shared/artifactory.properties.template deleted file mode 100644 index 42613c20a4..0000000000 --- a/weaver/tests/network-setups/shared/artifactory.properties.template +++ /dev/null @@ -1,2 +0,0 @@ -username= -password= \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/Makefile b/weaver/tests/network-setups/shared/charts/Makefile deleted file mode 100644 index 4464c5990d..0000000000 --- a/weaver/tests/network-setups/shared/charts/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -NW ?= network1 -VALUES ?= fabric-network/values.yaml -ARGS ?= -CCNAME ?= interop - -clean: del-network del-cc del-relay del-fabric-cli - -network: - helm dep up fabric-network - helm install fabric-$(NW) -f $(VALUES) --set global.network.name=$(NW) $(ARGS) ./fabric-network - -del-network: - helm delete fabric-$(NW) || true - -deploy-cc: - helm install deploycc-$(CCNAME)-$(NW) -f $(VALUES) --set global.network.name=$(NW) ./deploycc - -del-cc: - helm delete deploycc-$(CCNAME)-$(NW) || true - -deploy-relay: - helm install relay-$(NW) $(ARGS) --set network.name=$(NW) ./relay-one - -del-relay: - helm delete relay-$(NW) || true - -deploy-fabric-cli: - helm install fabric-cli-$(NW) $(ARGS) --set cli.network=$(NW) --set cli.remoteNetwork=$(RM_NW) ./fabric-cli - -del-fabric-cli: - helm delete fabric-cli-$(NW) || true - - -# kubectl cp $PEER2POD:/fabric/network1-secrets/fabric-cli/network2 ./nw-configs/network2 -# kubectl cp ./nw-configs/network2 $PEER1POD:/fabric/network1-secrets/fabric-cli/network2 -# kubectl cp $PEER1POD:/fabric/network1-secrets/fabric-cli/network1 ./nw-configs/network1 -# kubectl cp ./nw-configs/network1 $PEER2POD:/fabric/network1-secrets/fabric-cli/network1 - -# make network NW=network1 -# make deploy-cc NW=network1 CCNAME=interop VALUES=values/chaincode-interop.yaml -# make deploy-relay NW=network1 -# make deploy-fabric-cli NW=network1 RM_NW=network2 - -# make network NW=network2 VALUES=values/ibmcloud.yaml -# make deploy-cc NW=network2 CCNAME=interop VALUES=values/chaincode-interop.yaml -# make deploy-relay NW=network2 ARGS="-f values/ic-relay.yaml --set network.domain.cluster=ris3-int-dal12-ocp-9ca4d14d48413d18ce61b80811ba4308-0000.us-south.containers.appdomain.cloud --set deployment.namespace=dlt-interop-fabric2" -# make deploy-fabric-cli NW=network2 RM_NW=network1 diff --git a/weaver/tests/network-setups/shared/charts/Readme.md b/weaver/tests/network-setups/shared/charts/Readme.md deleted file mode 100644 index f1428b1bf3..0000000000 --- a/weaver/tests/network-setups/shared/charts/Readme.md +++ /dev/null @@ -1,64 +0,0 @@ - -# Helm Charts for dlt-interop - - Before deploying to kubernetes, make sure kubeconfig is pointing to your k8s cluster. - - ### Pre-requisites - - 1. Helm v3 - - - ### Artifactory APIKEY - - Obtain the artifactory apikey and save it in a file, say `apikey`. \ - Now run this to create secret for apikey into the k8s cluster: - ``` - kubectl create secret generic artifactory-apikey --from-file=username=./username --from-file=apikey=./apikey - ``` - - ### Docker Login - - To deploy these charts into k8s cluster, docker login to repository is required: \ - ``` - docker login res-dlt-interop-docker-local.artifactory.swg-devops.com - ``` - This will create `$HOME/.docker/config.json`. \ - \ - Now run following to place this as a secret in k8s: - ``` - kubectl create secret generic interop-artifactory \ - --from-file=.dockerconfigjson=$HOME/.docker/config.json \ - --type=kubernetes.io/dockerconfigjson - ``` - - ### Install Network Charts - - Now run: - ``` - make network NW= - ``` - for ibmcloud k8s cluster, values/ibmcloud.yaml needs to be used, so run: - ``` - make network NW= VALUES=values/ibmcloud.yaml - ``` - To uninstalled the network, run: - ``` - make del-network NW= - ``` - - ### Deploy Chaincode - - Make sure the chaincode that needs to be deployed, its docker image is present in some docker registry (either in JFrog Artifactory, or cloud registry). \ - Create values file for the chaincode, check `deploycc/values.yaml` for reference. Minimal requirement is to change `chaincodes` key. \ - Now run: - ``` - make deploy-cc NW= CCNAME= VALUES= - ``` - To uninstall the chart for this chaincode run: - ``` - make del-cc NW= CCNAME= - ``` diff --git a/weaver/tests/network-setups/shared/charts/config-maps/.helmignore b/weaver/tests/network-setups/shared/charts/config-maps/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/config-maps/Chart.yaml b/weaver/tests/network-setups/shared/charts/config-maps/Chart.yaml deleted file mode 100644 index 78b952df6f..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: config-maps -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/build b/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/build deleted file mode 100644 index 34fd785328..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -SOURCE=$1 -OUTPUT=$3 - -#external chaincodes expect connection.json file in the chaincode package -if [ ! -f "$SOURCE/connection.json" ]; then - >&2 echo "$SOURCE/connection.json not found" - exit 1 -fi - -#simply copy the endpoint information to specified output location -echo "Build Started..." -cp $SOURCE/connection.json $OUTPUT/connection.json - -if [ -d "$SOURCE/metadata" ]; then - cp -a $SOURCE/metadata $OUTPUT/metadata -fi - -exit 0 diff --git a/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/detect b/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/detect deleted file mode 100644 index 50abc87d2e..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/detect +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -METADIR=$2 -#check if the "type" field is set to "external" -echo "Inside External Builder: Detect" -if [ "$(jq -r .type "$METADIR/metadata.json")" == "external" ]; then - echo "Using External Builder" - exit 0 -fi -echo "Inside External Builder: Detect: Failed. Going to regular chaincode installation..." -exit 1 diff --git a/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/release b/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/release deleted file mode 100644 index 5bddac9d59..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/external-service-builder/bin/release +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -BLD="$1" -RELEASE="$2" - -if [ -d "$BLD/metadata" ]; then - cp -a "$BLD/metadata/"* "$RELEASE/" -fi - -echo "Chaincode installed." - -#external chaincodes expect artifacts to be placed under "$RELEASE"/chaincode/server -if [ -f $BLD/connection.json ]; then - mkdir -p "$RELEASE"/chaincode/server - cp $BLD/connection.json "$RELEASE"/chaincode/server - - #if tls_required is true, copy TLS files (using above example, the fully qualified path for these fils would be "$RELEASE"/chaincode/server/tls) - - exit 0 -fi - -exit 1 diff --git a/weaver/tests/network-setups/shared/charts/config-maps/generate-ccp/ccp-generate.sh b/weaver/tests/network-setups/shared/charts/config-maps/generate-ccp/ccp-generate.sh deleted file mode 100644 index 889c63e18e..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/generate-ccp/ccp-generate.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -function one_line_pem { - echo "`awk 'NF {sub(/\\n/, ""); printf "%s\\\\\\\n",$0;}' $1`" -} - -function json_ccp { - local PP=$(one_line_pem $4) - local CP=$(one_line_pem $5) - sed -e "s/\${ORG}/$1/" \ - -e "s/\${P0PORT}/$2/" \ - -e "s/\${CAPORT}/$3/" \ - -e "s#\${PEERPEM}#$PP#" \ - -e "s#\${CAPEM}#$CP#" \ - -e "s/\${NW}/$6/" \ - -e "s/\${ORGMSP}/$7/" \ - $8 -} - -echo "$(json_ccp $ORG $P0PORT $CAPORT $PEERPEM $CAPEM $NW $ORGMSP $CCP_TEMPLATE)" > $CCPPATH -echo "PEER PEM:" $PEERPEM -echo "CA PEM:" $CAPEM diff --git a/weaver/tests/network-setups/shared/charts/config-maps/generate-ccp/ccp-template.json b/weaver/tests/network-setups/shared/charts/config-maps/generate-ccp/ccp-template.json deleted file mode 100644 index 9f25ad5140..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/generate-ccp/ccp-template.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "${ORG}-${NW}", - "version": "1.0.0", - "client": { - "organization": "${ORG}", - "connection": { - "timeout": { - "peer": { - "endorser": "10000" - } - } - } - }, - "organizations": { - "${ORG}": { - "mspid": "${ORGMSP}", - "peers": [ - "peer0-${ORG}-${NW}" - ], - "certificateAuthorities": [ - "ca-${ORG}-${NW}" - ] - } - }, - "peers": { - "peer0-${ORG}-${NW}": { - "url": "grpcs://peer0-${ORG}-${NW}:${P0PORT}", - "tlsCACerts": { - "pem": "${PEERPEM}" - }, - "grpcOptions": { - "ssl-target-name-override": "peer0-${ORG}-${NW}", - "hostnameOverride": "peer0-${ORG}-${NW}", - "request-timeout": 120001 - } - } - }, - "certificateAuthorities": { - "ca-${ORG}-${NW}": { - "url": "https://ca-${ORG}-${NW}:${CAPORT}", - "caName": "ca-${ORG}-${NW}", - "tlsCACerts": { - "pem": "${CAPEM}" - }, - "httpOptions": { - "verify": false, - "request-timeout": 120001 - } - } - } -} diff --git a/weaver/tests/network-setups/shared/charts/config-maps/network1/configtx.yaml b/weaver/tests/network-setups/shared/charts/config-maps/network1/configtx.yaml deleted file mode 100644 index 0c1276a8ad..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/network1/configtx.yaml +++ /dev/null @@ -1,358 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -################################################################################ -# -# Section: Organizations -# -# - This section defines the different organizational identities which will -# be referenced later in the configuration. -# -################################################################################ -Organizations: - - # SampleOrg defines an MSP using the sampleconfig. It should never be used - # in production but may be used as a template for other definitions - - &OrdererOrg - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: OrdererOrg - - # ID to load the MSP definition as - ID: OrdererMSP - - # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: ./ordererOrganizations/orderer/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Writers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Admins: - Type: Signature - Rule: "OR('OrdererMSP.admin')" - - OrdererEndpoints: - - ord0-orderers-network1:7050 - - - &Org1 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org1MSP - - # ID to load the MSP definition as - ID: Org1MSP - - MSPDir: ./peerOrganizations/org1/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org1MSP.admin')" - Endorsement: - Type: Signature - Rule: "OR('Org1MSP.peer')" - - # leave this flag set to true. - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0-org1-network1 - Port: 7051 - - - &Org2 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org2MSP - - # ID to load the MSP definition as - ID: Org2MSP - - MSPDir: ./peerOrganizations/org2/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org2MSP.admin')" - Endorsement: - Type: Signature - Rule: "OR('Org2MSP.peer')" - - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0-org2-network1 - Port: 7051 - -################################################################################ -# -# SECTION: Capabilities -# -# - This section defines the capabilities of fabric network. This is a new -# concept as of v1.1.0 and should not be utilized in mixed networks with -# v1.0.x peers and orderers. Capabilities define features which must be -# present in a fabric binary for that binary to safely participate in the -# fabric network. For instance, if a new MSP type is added, newer binaries -# might recognize and validate the signatures from this type, while older -# binaries without this support would be unable to validate those -# transactions. This could lead to different versions of the fabric binaries -# having different world states. Instead, defining a capability for a channel -# informs those binaries without this capability that they must cease -# processing transactions until they have been upgraded. For v1.0.x if any -# capabilities are defined (including a map with all capabilities turned off) -# then the v1.0.x peer will deliberately crash. -# -################################################################################ -Capabilities: - # Channel capabilities apply to both the orderers and the peers and must be - # supported by both. - # Set the value of the capability to true to require it. - Channel: &ChannelCapabilities - # V2_0 capability ensures that orderers and peers behave according - # to v2.0 channel capabilities. Orderers and peers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 capability. - # Prior to enabling V2.0 channel capabilities, ensure that all - # orderers and peers on a channel are at v2.0.0 or later. - V2_0: true - - # Orderer capabilities apply only to the orderers, and may be safely - # used with prior release peers. - # Set the value of the capability to true to require it. - Orderer: &OrdererCapabilities - # V2_0 orderer capability ensures that orderers behave according - # to v2.0 orderer capabilities. Orderers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 orderer capability. - # Prior to enabling V2.0 orderer capabilities, ensure that all - # orderers on channel are at v2.0.0 or later. - V2_0: true - - # Application capabilities apply only to the peer network, and may be safely - # used with prior release orderers. - # Set the value of the capability to true to require it. - Application: &ApplicationCapabilities - # V2_0 application capability ensures that peers behave according - # to v2.0 application capabilities. Peers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 application capability. - # Prior to enabling V2.0 application capabilities, ensure that all - # peers on channel are at v2.0.0 or later. - V2_0: true - -################################################################################ -# -# SECTION: Application -# -# - This section defines the values to encode into a config transaction or -# genesis block for application related parameters -# -################################################################################ -Application: &ApplicationDefaults - - # Organizations is the list of orgs which are defined as participants on - # the application side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Application policies, their canonical path is - # /Channel/Application/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - LifecycleEndorsement: - Type: ImplicitMeta - Rule: "MAJORITY Endorsement" - Endorsement: - Type: ImplicitMeta - Rule: "MAJORITY Endorsement" - - Capabilities: - <<: *ApplicationCapabilities -################################################################################ -# -# SECTION: Orderer -# -# - This section defines the values to encode into a config transaction or -# genesis block for orderer related parameters -# -################################################################################ -Orderer: &OrdererDefaults - - # Orderer Type: The orderer implementation to start - OrdererType: etcdraft - - EtcdRaft: - Consenters: - - Host: ord0-orderers-network1 - Port: 7050 - ClientTLSCert: ./ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/server.crt - ServerTLSCert: ./ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/server.crt - - Addresses: - - ord0-orderers-network1:7050 - - # Batch Timeout: The amount of time to wait before creating a batch - BatchTimeout: 2s - - # Batch Size: Controls the number of messages batched into a block - BatchSize: - - # Max Message Count: The maximum number of messages to permit in a batch - MaxMessageCount: 10 - - # Absolute Max Bytes: The absolute maximum number of bytes allowed for - # the serialized messages in a batch. - AbsoluteMaxBytes: 99 MB - - # Preferred Max Bytes: The preferred maximum number of bytes allowed for - # the serialized messages in a batch. A message larger than the preferred - # max bytes will result in a batch larger than preferred max bytes. - PreferredMaxBytes: 512 KB - - # Organizations is the list of orgs which are defined as participants on - # the orderer side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Orderer policies, their canonical path is - # /Channel/Orderer/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - # BlockValidation specifies what signatures must be included in the block - # from the orderer for the peer to validate it. - BlockValidation: - Type: ImplicitMeta - Rule: "ANY Writers" - -################################################################################ -# -# CHANNEL -# -# This section defines the values to encode into a config transaction or -# genesis block for channel related parameters. -# -################################################################################ -Channel: &ChannelDefaults - # Policies defines the set of policies at this level of the config tree - # For Channel policies, their canonical path is - # /Channel/ - Policies: - # Who may invoke the 'Deliver' API - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - # Who may invoke the 'Broadcast' API - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - # By default, who may modify elements at this config level - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - - # Capabilities describes the channel level capabilities, see the - # dedicated Capabilities section elsewhere in this file for a full - # description - Capabilities: - <<: *ChannelCapabilities - -################################################################################ -# -# Profile -# -# - Different configuration profiles may be encoded here to be specified -# as parameters to the configtxgen tool -# -################################################################################ -Profiles: - - OneOrgOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - OneOrgChannel: - Consortium: SampleConsortium - <<: *ChannelDefaults - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - Capabilities: - <<: *ApplicationCapabilities - - TwoOrgsOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - - *Org2 - TwoOrgsChannel: - Consortium: SampleConsortium - <<: *ChannelDefaults - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - - *Org2 - Capabilities: - <<: *ApplicationCapabilities diff --git a/weaver/tests/network-setups/shared/charts/config-maps/network2/configtx.yaml b/weaver/tests/network-setups/shared/charts/config-maps/network2/configtx.yaml deleted file mode 100644 index 492fa6cbf6..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/network2/configtx.yaml +++ /dev/null @@ -1,358 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -################################################################################ -# -# Section: Organizations -# -# - This section defines the different organizational identities which will -# be referenced later in the configuration. -# -################################################################################ -Organizations: - - # SampleOrg defines an MSP using the sampleconfig. It should never be used - # in production but may be used as a template for other definitions - - &OrdererOrg - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: OrdererOrg - - # ID to load the MSP definition as - ID: OrdererMSP - - # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: ./ordererOrganizations/orderer/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Writers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Admins: - Type: Signature - Rule: "OR('OrdererMSP.admin')" - - OrdererEndpoints: - - ord0-orderers-network2:7050 - - - &Org1 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org1MSP - - # ID to load the MSP definition as - ID: Org1MSP - - MSPDir: ./peerOrganizations/org1/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org1MSP.admin')" - Endorsement: - Type: Signature - Rule: "OR('Org1MSP.peer')" - - # leave this flag set to true. - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0-org1-network2 - Port: 7051 - - - &Org2 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org2MSP - - # ID to load the MSP definition as - ID: Org2MSP - - MSPDir: ./peerOrganizations/org2/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org2MSP.admin')" - Endorsement: - Type: Signature - Rule: "OR('Org2MSP.peer')" - - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0-org2-network2 - Port: 7051 - -################################################################################ -# -# SECTION: Capabilities -# -# - This section defines the capabilities of fabric network. This is a new -# concept as of v1.1.0 and should not be utilized in mixed networks with -# v1.0.x peers and orderers. Capabilities define features which must be -# present in a fabric binary for that binary to safely participate in the -# fabric network. For instance, if a new MSP type is added, newer binaries -# might recognize and validate the signatures from this type, while older -# binaries without this support would be unable to validate those -# transactions. This could lead to different versions of the fabric binaries -# having different world states. Instead, defining a capability for a channel -# informs those binaries without this capability that they must cease -# processing transactions until they have been upgraded. For v1.0.x if any -# capabilities are defined (including a map with all capabilities turned off) -# then the v1.0.x peer will deliberately crash. -# -################################################################################ -Capabilities: - # Channel capabilities apply to both the orderers and the peers and must be - # supported by both. - # Set the value of the capability to true to require it. - Channel: &ChannelCapabilities - # V2_0 capability ensures that orderers and peers behave according - # to v2.0 channel capabilities. Orderers and peers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 capability. - # Prior to enabling V2.0 channel capabilities, ensure that all - # orderers and peers on a channel are at v2.0.0 or later. - V2_0: true - - # Orderer capabilities apply only to the orderers, and may be safely - # used with prior release peers. - # Set the value of the capability to true to require it. - Orderer: &OrdererCapabilities - # V2_0 orderer capability ensures that orderers behave according - # to v2.0 orderer capabilities. Orderers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 orderer capability. - # Prior to enabling V2.0 orderer capabilities, ensure that all - # orderers on channel are at v2.0.0 or later. - V2_0: true - - # Application capabilities apply only to the peer network, and may be safely - # used with prior release orderers. - # Set the value of the capability to true to require it. - Application: &ApplicationCapabilities - # V2_0 application capability ensures that peers behave according - # to v2.0 application capabilities. Peers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 application capability. - # Prior to enabling V2.0 application capabilities, ensure that all - # peers on channel are at v2.0.0 or later. - V2_0: true - -################################################################################ -# -# SECTION: Application -# -# - This section defines the values to encode into a config transaction or -# genesis block for application related parameters -# -################################################################################ -Application: &ApplicationDefaults - - # Organizations is the list of orgs which are defined as participants on - # the application side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Application policies, their canonical path is - # /Channel/Application/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - LifecycleEndorsement: - Type: ImplicitMeta - Rule: "MAJORITY Endorsement" - Endorsement: - Type: ImplicitMeta - Rule: "MAJORITY Endorsement" - - Capabilities: - <<: *ApplicationCapabilities -################################################################################ -# -# SECTION: Orderer -# -# - This section defines the values to encode into a config transaction or -# genesis block for orderer related parameters -# -################################################################################ -Orderer: &OrdererDefaults - - # Orderer Type: The orderer implementation to start - OrdererType: etcdraft - - EtcdRaft: - Consenters: - - Host: ord0-orderers-network2 - Port: 7050 - ClientTLSCert: ./ordererOrganizations/orderer/orderers/ord0-orderers-network2/tls/server.crt - ServerTLSCert: ./ordererOrganizations/orderer/orderers/ord0-orderers-network2/tls/server.crt - - Addresses: - - ord0-orderers-network2:7050 - - # Batch Timeout: The amount of time to wait before creating a batch - BatchTimeout: 2s - - # Batch Size: Controls the number of messages batched into a block - BatchSize: - - # Max Message Count: The maximum number of messages to permit in a batch - MaxMessageCount: 10 - - # Absolute Max Bytes: The absolute maximum number of bytes allowed for - # the serialized messages in a batch. - AbsoluteMaxBytes: 99 MB - - # Preferred Max Bytes: The preferred maximum number of bytes allowed for - # the serialized messages in a batch. A message larger than the preferred - # max bytes will result in a batch larger than preferred max bytes. - PreferredMaxBytes: 512 KB - - # Organizations is the list of orgs which are defined as participants on - # the orderer side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Orderer policies, their canonical path is - # /Channel/Orderer/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - # BlockValidation specifies what signatures must be included in the block - # from the orderer for the peer to validate it. - BlockValidation: - Type: ImplicitMeta - Rule: "ANY Writers" - -################################################################################ -# -# CHANNEL -# -# This section defines the values to encode into a config transaction or -# genesis block for channel related parameters. -# -################################################################################ -Channel: &ChannelDefaults - # Policies defines the set of policies at this level of the config tree - # For Channel policies, their canonical path is - # /Channel/ - Policies: - # Who may invoke the 'Deliver' API - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - # Who may invoke the 'Broadcast' API - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - # By default, who may modify elements at this config level - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - - # Capabilities describes the channel level capabilities, see the - # dedicated Capabilities section elsewhere in this file for a full - # description - Capabilities: - <<: *ChannelCapabilities - -################################################################################ -# -# Profile -# -# - Different configuration profiles may be encoded here to be specified -# as parameters to the configtxgen tool -# -################################################################################ -Profiles: - - OneOrgOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - OneOrgChannel: - Consortium: SampleConsortium - <<: *ChannelDefaults - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - Capabilities: - <<: *ApplicationCapabilities - - TwoOrgsOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - - *Org2 - TwoOrgsChannel: - Consortium: SampleConsortium - <<: *ChannelDefaults - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - - *Org2 - Capabilities: - <<: *ApplicationCapabilities diff --git a/weaver/tests/network-setups/shared/charts/config-maps/peer-config/core.yaml b/weaver/tests/network-setups/shared/charts/config-maps/peer-config/core.yaml deleted file mode 100644 index fd6cc5a55b..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/peer-config/core.yaml +++ /dev/null @@ -1,727 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################### -# -# Peer section -# -############################################################################### -peer: - - # The peer id provides a name for this peer instance and is used when - # naming docker resources. - id: jdoe - - # The networkId allows for logical separation of networks and is used when - # naming docker resources. - networkId: dev - - # The Address at local network interface this Peer will listen on. - # By default, it will listen on all network interfaces - listenAddress: 0.0.0.0:7051 - - # The endpoint this peer uses to listen for inbound chaincode connections. - # If this is commented-out, the listen address is selected to be - # the peer's address (see below) with port 7052 - # chaincodeListenAddress: 0.0.0.0:7052 - - # The endpoint the chaincode for this peer uses to connect to the peer. - # If this is not specified, the chaincodeListenAddress address is selected. - # And if chaincodeListenAddress is not specified, address is selected from - # peer listenAddress. - # chaincodeAddress: 0.0.0.0:7052 - - # When used as peer config, this represents the endpoint to other peers - # in the same organization. For peers in other organization, see - # gossip.externalEndpoint for more info. - # When used as CLI config, this means the peer's endpoint to interact with - address: 0.0.0.0:7051 - - # Whether the Peer should programmatically determine its address - # This case is useful for docker containers. - addressAutoDetect: false - - # Keepalive settings for peer server and clients - keepalive: - # Interval is the duration after which if the server does not see - # any activity from the client it pings the client to see if it's alive - interval: 7200s - # Timeout is the duration the server waits for a response - # from the client after sending a ping before closing the connection - timeout: 20s - # MinInterval is the minimum permitted time between client pings. - # If clients send pings more frequently, the peer server will - # disconnect them - minInterval: 60s - # Client keepalive settings for communicating with other peer nodes - client: - # Interval is the time between pings to peer nodes. This must - # greater than or equal to the minInterval specified by peer - # nodes - interval: 60s - # Timeout is the duration the client waits for a response from - # peer nodes before closing the connection - timeout: 20s - # DeliveryClient keepalive settings for communication with ordering - # nodes. - deliveryClient: - # Interval is the time between pings to ordering nodes. This must - # greater than or equal to the minInterval specified by ordering - # nodes. - interval: 60s - # Timeout is the duration the client waits for a response from - # ordering nodes before closing the connection - timeout: 20s - - - # Gossip related configuration - gossip: - # Bootstrap set to initialize gossip with. - # This is a list of other peers that this peer reaches out to at startup. - # Important: The endpoints here have to be endpoints of peers in the same - # organization, because the peer would refuse connecting to these endpoints - # unless they are in the same organization as the peer. - bootstrap: 127.0.0.1:7051 - - # NOTE: orgLeader and useLeaderElection parameters are mutual exclusive. - # Setting both to true would result in the termination of the peer - # since this is undefined state. If the peers are configured with - # useLeaderElection=false, make sure there is at least 1 peer in the - # organization that its orgLeader is set to true. - - # Defines whenever peer will initialize dynamic algorithm for - # "leader" selection, where leader is the peer to establish - # connection with ordering service and use delivery protocol - # to pull ledger blocks from ordering service. It is recommended to - # use leader election for large networks of peers. - useLeaderElection: true - # Statically defines peer to be an organization "leader", - # where this means that current peer will maintain connection - # with ordering service and disseminate block across peers in - # its own organization - orgLeader: false - - # Interval for membershipTracker polling - membershipTrackerInterval: 5s - - # Overrides the endpoint that the peer publishes to peers - # in its organization. For peers in foreign organizations - # see 'externalEndpoint' - endpoint: - # Maximum count of blocks stored in memory - maxBlockCountToStore: 100 - # Max time between consecutive message pushes(unit: millisecond) - maxPropagationBurstLatency: 10ms - # Max number of messages stored until a push is triggered to remote peers - maxPropagationBurstSize: 10 - # Number of times a message is pushed to remote peers - propagateIterations: 1 - # Number of peers selected to push messages to - propagatePeerNum: 3 - # Determines frequency of pull phases(unit: second) - # Must be greater than digestWaitTime + responseWaitTime - pullInterval: 4s - # Number of peers to pull from - pullPeerNum: 3 - # Determines frequency of pulling state info messages from peers(unit: second) - requestStateInfoInterval: 4s - # Determines frequency of pushing state info messages to peers(unit: second) - publishStateInfoInterval: 4s - # Maximum time a stateInfo message is kept until expired - stateInfoRetentionInterval: - # Time from startup certificates are included in Alive messages(unit: second) - publishCertPeriod: 10s - # Should we skip verifying block messages or not (currently not in use) - skipBlockVerification: false - # Dial timeout(unit: second) - dialTimeout: 3s - # Connection timeout(unit: second) - connTimeout: 2s - # Buffer size of received messages - recvBuffSize: 20 - # Buffer size of sending messages - sendBuffSize: 200 - # Time to wait before pull engine processes incoming digests (unit: second) - # Should be slightly smaller than requestWaitTime - digestWaitTime: 1s - # Time to wait before pull engine removes incoming nonce (unit: milliseconds) - # Should be slightly bigger than digestWaitTime - requestWaitTime: 1500ms - # Time to wait before pull engine ends pull (unit: second) - responseWaitTime: 2s - # Alive check interval(unit: second) - aliveTimeInterval: 5s - # Alive expiration timeout(unit: second) - aliveExpirationTimeout: 25s - # Reconnect interval(unit: second) - reconnectInterval: 25s - # This is an endpoint that is published to peers outside of the organization. - # If this isn't set, the peer will not be known to other organizations. - externalEndpoint: - # Leader election service configuration - election: - # Longest time peer waits for stable membership during leader election startup (unit: second) - startupGracePeriod: 15s - # Interval gossip membership samples to check its stability (unit: second) - membershipSampleInterval: 1s - # Time passes since last declaration message before peer decides to perform leader election (unit: second) - leaderAliveThreshold: 10s - # Time between peer sends propose message and declares itself as a leader (sends declaration message) (unit: second) - leaderElectionDuration: 5s - - pvtData: - # pullRetryThreshold determines the maximum duration of time private data corresponding for a given block - # would be attempted to be pulled from peers until the block would be committed without the private data - pullRetryThreshold: 60s - # As private data enters the transient store, it is associated with the peer's ledger's height at that time. - # transientstoreMaxBlockRetention defines the maximum difference between the current ledger's height upon commit, - # and the private data residing inside the transient store that is guaranteed not to be purged. - # Private data is purged from the transient store when blocks with sequences that are multiples - # of transientstoreMaxBlockRetention are committed. - transientstoreMaxBlockRetention: 1000 - # pushAckTimeout is the maximum time to wait for an acknowledgement from each peer - # at private data push at endorsement time. - pushAckTimeout: 3s - # Block to live pulling margin, used as a buffer - # to prevent peer from trying to pull private data - # from peers that is soon to be purged in next N blocks. - # This helps a newly joined peer catch up to current - # blockchain height quicker. - btlPullMargin: 10 - # the process of reconciliation is done in an endless loop, while in each iteration reconciler tries to - # pull from the other peers the most recent missing blocks with a maximum batch size limitation. - # reconcileBatchSize determines the maximum batch size of missing private data that will be reconciled in a - # single iteration. - reconcileBatchSize: 10 - # reconcileSleepInterval determines the time reconciler sleeps from end of an iteration until the beginning - # of the next reconciliation iteration. - reconcileSleepInterval: 1m - # reconciliationEnabled is a flag that indicates whether private data reconciliation is enable or not. - reconciliationEnabled: true - # skipPullingInvalidTransactionsDuringCommit is a flag that indicates whether pulling of invalid - # transaction's private data from other peers need to be skipped during the commit time and pulled - # only through reconciler. - skipPullingInvalidTransactionsDuringCommit: false - # implicitCollectionDisseminationPolicy specifies the dissemination policy for the peer's own implicit collection. - # When a peer endorses a proposal that writes to its own implicit collection, below values override the default values - # for disseminating private data. - # Note that it is applicable to all channels the peer has joined. The implication is that requiredPeerCount has to - # be smaller than the number of peers in a channel that has the lowest numbers of peers from the organization. - implicitCollectionDisseminationPolicy: - # requiredPeerCount defines the minimum number of eligible peers to which the peer must successfully - # disseminate private data for its own implicit collection during endorsement. Default value is 0. - requiredPeerCount: 0 - # maxPeerCount defines the maximum number of eligible peers to which the peer will attempt to - # disseminate private data for its own implicit collection during endorsement. Default value is 1. - maxPeerCount: 1 - - # Gossip state transfer related configuration - state: - # indicates whenever state transfer is enabled or not - # default value is true, i.e. state transfer is active - # and takes care to sync up missing blocks allowing - # lagging peer to catch up to speed with rest network - enabled: true - # checkInterval interval to check whether peer is lagging behind enough to - # request blocks via state transfer from another peer. - checkInterval: 10s - # responseTimeout amount of time to wait for state transfer response from - # other peers - responseTimeout: 3s - # batchSize the number of blocks to request via state transfer from another peer - batchSize: 10 - # blockBufferSize reflects the size of the re-ordering buffer - # which captures blocks and takes care to deliver them in order - # down to the ledger layer. The actually buffer size is bounded between - # 0 and 2*blockBufferSize, each channel maintains its own buffer - blockBufferSize: 100 - # maxRetries maximum number of re-tries to ask - # for single state transfer request - maxRetries: 3 - - # TLS Settings - tls: - # Require server-side TLS - enabled: false - # Require client certificates / mutual TLS. - # Note that clients that are not configured to use a certificate will - # fail to connect to the peer. - clientAuthRequired: false - # X.509 certificate used for TLS server - cert: - file: tls/server.crt - # Private key used for TLS server (and client if clientAuthEnabled - # is set to true - key: - file: tls/server.key - # Trusted root certificate chain for tls.cert - rootcert: - file: tls/ca.crt - # Set of root certificate authorities used to verify client certificates - clientRootCAs: - files: - - tls/ca.crt - # Private key used for TLS when making client connections. If - # not set, peer.tls.key.file will be used instead - clientKey: - file: - # X.509 certificate used for TLS when making client connections. - # If not set, peer.tls.cert.file will be used instead - clientCert: - file: - - # Authentication contains configuration parameters related to authenticating - # client messages - authentication: - # the acceptable difference between the current server time and the - # client's time as specified in a client request message - timewindow: 15m - - # Path on the file system where peer will store data (eg ledger). This - # location must be access control protected to prevent unintended - # modification that might corrupt the peer operations. - fileSystemPath: /var/hyperledger/production - - # BCCSP (Blockchain crypto provider): Select which crypto implementation or - # library to use - BCCSP: - Default: SW - # Settings for the SW crypto provider (i.e. when DEFAULT: SW) - SW: - # TODO: The default Hash and Security level needs refactoring to be - # fully configurable. Changing these defaults requires coordination - # SHA2 is hardcoded in several places, not only BCCSP - Hash: SHA2 - Security: 256 - # Location of Key Store - FileKeyStore: - # If "", defaults to 'mspConfigPath'/keystore - KeyStore: - # Settings for the PKCS#11 crypto provider (i.e. when DEFAULT: PKCS11) - PKCS11: - # Location of the PKCS11 module library - Library: - # Token Label - Label: - # User PIN - Pin: - Hash: - Security: - - # Path on the file system where peer will find MSP local configurations - mspConfigPath: msp - - # Identifier of the local MSP - # ----!!!!IMPORTANT!!!-!!!IMPORTANT!!!-!!!IMPORTANT!!!!---- - # Deployers need to change the value of the localMspId string. - # In particular, the name of the local MSP ID of a peer needs - # to match the name of one of the MSPs in each of the channel - # that this peer is a member of. Otherwise this peer's messages - # will not be identified as valid by other nodes. - localMspId: SampleOrg - - # CLI common client config options - client: - # connection timeout - connTimeout: 3s - - # Delivery service related config - deliveryclient: - # It sets the total time the delivery service may spend in reconnection - # attempts until its retry logic gives up and returns an error - reconnectTotalTimeThreshold: 3600s - - # It sets the delivery service <-> ordering service node connection timeout - connTimeout: 3s - - # It sets the delivery service maximal delay between consecutive retries - reConnectBackoffThreshold: 3600s - - # A list of orderer endpoint addresses which should be overridden - # when found in channel configurations. - addressOverrides: - # - from: - # to: - # caCertsFile: - # - from: - # to: - # caCertsFile: - - # Type for the local MSP - by default it's of type bccsp - localMspType: bccsp - - # Used with Go profiling tools only in none production environment. In - # production, it should be disabled (eg enabled: false) - profile: - enabled: false - listenAddress: 0.0.0.0:6060 - - # Handlers defines custom handlers that can filter and mutate - # objects passing within the peer, such as: - # Auth filter - reject or forward proposals from clients - # Decorators - append or mutate the chaincode input passed to the chaincode - # Endorsers - Custom signing over proposal response payload and its mutation - # Valid handler definition contains: - # - A name which is a factory method name defined in - # core/handlers/library/library.go for statically compiled handlers - # - library path to shared object binary for pluggable filters - # Auth filters and decorators are chained and executed in the order that - # they are defined. For example: - # authFilters: - # - - # name: FilterOne - # library: /opt/lib/filter.so - # - - # name: FilterTwo - # decorators: - # - - # name: DecoratorOne - # - - # name: DecoratorTwo - # library: /opt/lib/decorator.so - # Endorsers are configured as a map that its keys are the endorsement system chaincodes that are being overridden. - # Below is an example that overrides the default ESCC and uses an endorsement plugin that has the same functionality - # as the default ESCC. - # If the 'library' property is missing, the name is used as the constructor method in the builtin library similar - # to auth filters and decorators. - # endorsers: - # escc: - # name: DefaultESCC - # library: /etc/hyperledger/fabric/plugin/escc.so - handlers: - authFilters: - - - name: DefaultAuth - - - name: ExpirationCheck # This filter checks identity x509 certificate expiration - decorators: - - - name: DefaultDecorator - endorsers: - escc: - name: DefaultEndorsement - library: - validators: - vscc: - name: DefaultValidation - library: - - # library: /etc/hyperledger/fabric/plugin/escc.so - # Number of goroutines that will execute transaction validation in parallel. - # By default, the peer chooses the number of CPUs on the machine. Set this - # variable to override that choice. - # NOTE: overriding this value might negatively influence the performance of - # the peer so please change this value only if you know what you're doing - validatorPoolSize: - - # The discovery service is used by clients to query information about peers, - # such as - which peers have joined a certain channel, what is the latest - # channel config, and most importantly - given a chaincode and a channel, - # what possible sets of peers satisfy the endorsement policy. - discovery: - enabled: true - # Whether the authentication cache is enabled or not. - authCacheEnabled: true - # The maximum size of the cache, after which a purge takes place - authCacheMaxSize: 1000 - # The proportion (0 to 1) of entries that remain in the cache after the cache is purged due to overpopulation - authCachePurgeRetentionRatio: 0.75 - # Whether to allow non-admins to perform non channel scoped queries. - # When this is false, it means that only peer admins can perform non channel scoped queries. - orgMembersAllowedAccess: false - - # Limits is used to configure some internal resource limits. - limits: - # Concurrency limits the number of concurrently running requests to a service on each peer. - # Currently this option is only applied to endorser service and deliver service. - # When the property is missing or the value is 0, the concurrency limit is disabled for the service. - concurrency: - # endorserService limits concurrent requests to endorser service that handles chaincode deployment, query and invocation, - # including both user chaincodes and system chaincodes. - endorserService: 2500 - # deliverService limits concurrent event listeners registered to deliver service for blocks and transaction events. - deliverService: 2500 - -############################################################################### -# -# VM section -# -############################################################################### -vm: - - # Endpoint of the vm management system. For docker can be one of the following in general - # unix:///var/run/docker.sock - # http://localhost:2375 - # https://localhost:2376 - endpoint: unix:///var/run/docker.sock - - # settings for docker vms - docker: - tls: - enabled: false - ca: - file: docker/ca.crt - cert: - file: docker/tls.crt - key: - file: docker/tls.key - - # Enables/disables the standard out/err from chaincode containers for - # debugging purposes - attachStdout: false - - # Parameters on creating docker container. - # Container may be efficiently created using ipam & dns-server for cluster - # NetworkMode - sets the networking mode for the container. Supported - # standard values are: `host`(default),`bridge`,`ipvlan`,`none`. - # Dns - a list of DNS servers for the container to use. - # Note: `Privileged` `Binds` `Links` and `PortBindings` properties of - # Docker Host Config are not supported and will not be used if set. - # LogConfig - sets the logging driver (Type) and related options - # (Config) for Docker. For more info, - # https://docs.docker.com/engine/admin/logging/overview/ - # Note: Set LogConfig using Environment Variables is not supported. - hostConfig: - NetworkMode: host - Dns: - # - 192.168.0.1 - LogConfig: - Type: json-file - Config: - max-size: "50m" - max-file: "5" - Memory: 2147483648 - -############################################################################### -# -# Chaincode section -# -############################################################################### -chaincode: - - # The id is used by the Chaincode stub to register the executing Chaincode - # ID with the Peer and is generally supplied through ENV variables - # the `path` form of ID is provided when installing the chaincode. - # The `name` is used for all other requests and can be any string. - id: - path: - name: - - # Generic builder environment, suitable for most chaincode types - builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION) - - # Enables/disables force pulling of the base docker images (listed below) - # during user chaincode instantiation. - # Useful when using moving image tags (such as :latest) - pull: false - - golang: - # golang will never need more than baseos - runtime: $(DOCKER_NS)/fabric-baseos:$(TWO_DIGIT_VERSION) - - # whether or not golang chaincode should be linked dynamically - dynamicLink: false - - java: - # This is an image based on java:openjdk-8 with addition compiler - # tools added for java shim layer packaging. - # This image is packed with shim layer libraries that are necessary - # for Java chaincode runtime. - runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) - - node: - # This is an image based on node:$(NODE_VER)-alpine - runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) - - # List of directories to treat as external builders and launchers for - # chaincode. The external builder detection processing will iterate over the - # builders in the order specified below. - externalBuilders: - - path: /fabric/external-service-builder - name: external-service-builder - propagateEnvironment: - - GOPROXY - - GONOPROXY - - GOSUMDB - - GONOSUMDB - - # The maximum duration to wait for the chaincode build and install process - # to complete. - installTimeout: 300s - - # Timeout duration for starting up a container and waiting for Register - # to come through. - startuptimeout: 300s - - # Timeout duration for Invoke and Init calls to prevent runaway. - # This timeout is used by all chaincodes in all the channels, including - # system chaincodes. - # Note that during Invoke, if the image is not available (e.g. being - # cleaned up when in development environment), the peer will automatically - # build the image, which might take more time. In production environment, - # the chaincode image is unlikely to be deleted, so the timeout could be - # reduced accordingly. - executetimeout: 30s - - # There are 2 modes: "dev" and "net". - # In dev mode, user runs the chaincode after starting peer from - # command line on local machine. - # In net mode, peer will run chaincode in a docker container. - mode: net - - # keepalive in seconds. In situations where the communication goes through a - # proxy that does not support keep-alive, this parameter will maintain connection - # between peer and chaincode. - # A value <= 0 turns keepalive off - keepalive: 0 - - # enabled system chaincodes. - system: - _lifecycle: enable - cscc: enable - lscc: enable - escc: enable - vscc: enable - qscc: enable - - # Logging section for the chaincode container - logging: - # Default level for all loggers within the chaincode container - level: info - # Override default level for the 'shim' logger - shim: warning - # Format for the chaincode container logs - format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}' - -############################################################################### -# -# Ledger section - ledger configuration encompasses both the blockchain -# and the state -# -############################################################################### -ledger: - - blockchain: - - state: - # stateDatabase - options are "goleveldb", "CouchDB" - # goleveldb - default state database stored in goleveldb. - # CouchDB - store state database in CouchDB - stateDatabase: goleveldb - # Limit on the number of records to return per query - totalQueryLimit: 100000 - couchDBConfig: - # It is recommended to run CouchDB on the same server as the peer, and - # not map the CouchDB container port to a server port in docker-compose. - # Otherwise proper security must be provided on the connection between - # CouchDB client (on the peer) and server. - couchDBAddress: 127.0.0.1:5984 - # This username must have read and write authority on CouchDB - username: - # The password is recommended to pass as an environment variable - # during start up (eg CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD). - # If it is stored here, the file must be access control protected - # to prevent unintended users from discovering the password. - password: - # Number of retries for CouchDB errors - maxRetries: 3 - # Number of retries for CouchDB errors during peer startup - maxRetriesOnStartup: 12 - # CouchDB request timeout (unit: duration, e.g. 20s) - requestTimeout: 35s - # Limit on the number of records per each CouchDB query - # Note that chaincode queries are only bound by totalQueryLimit. - # Internally the chaincode may execute multiple CouchDB queries, - # each of size internalQueryLimit. - internalQueryLimit: 1000 - # Limit on the number of records per CouchDB bulk update batch - maxBatchUpdateSize: 1000 - # Warm indexes after every N blocks. - # This option warms any indexes that have been - # deployed to CouchDB after every N blocks. - # A value of 1 will warm indexes after every block commit, - # to ensure fast selector queries. - # Increasing the value may improve write efficiency of peer and CouchDB, - # but may degrade query response time. - warmIndexesAfterNBlocks: 1 - # Create the _global_changes system database - # This is optional. Creating the global changes database will require - # additional system resources to track changes and maintain the database - createGlobalChangesDB: false - # CacheSize denotes the maximum mega bytes (MB) to be allocated for the in-memory state - # cache. Note that CacheSize needs to be a multiple of 32 MB. If it is not a multiple - # of 32 MB, the peer would round the size to the next multiple of 32 MB. - # To disable the cache, 0 MB needs to be assigned to the cacheSize. - cacheSize: 64 - - history: - # enableHistoryDatabase - options are true or false - # Indicates if the history of key updates should be stored. - # All history 'index' will be stored in goleveldb, regardless if using - # CouchDB or alternate database for the state. - enableHistoryDatabase: true - - pvtdataStore: - # the maximum db batch size for converting - # the ineligible missing data entries to eligible missing data entries - collElgProcMaxDbBatchSize: 5000 - # the minimum duration (in milliseconds) between writing - # two consecutive db batches for converting the ineligible missing data entries to eligible missing data entries - collElgProcDbBatchesInterval: 1000 - -############################################################################### -# -# Operations section -# -############################################################################### -operations: - # host and port for the operations server - listenAddress: 127.0.0.1:9443 - - # TLS configuration for the operations endpoint - tls: - # TLS enabled - enabled: false - - # path to PEM encoded server certificate for the operations server - cert: - file: - - # path to PEM encoded server key for the operations server - key: - file: - - # most operations service endpoints require client authentication when TLS - # is enabled. clientAuthRequired requires client certificate authentication - # at the TLS layer to access all resources. - clientAuthRequired: false - - # paths to PEM encoded ca certificates to trust for client authentication - clientRootCAs: - files: [] - -############################################################################### -# -# Metrics section -# -############################################################################### -metrics: - # metrics provider is one of statsd, prometheus, or disabled - provider: disabled - - # statsd configuration - statsd: - # network type: tcp or udp - network: udp - - # statsd server address - address: 127.0.0.1:8125 - - # the interval at which locally cached counters and gauges are pushed - # to statsd; timings are pushed immediately - writeInterval: 10s - - # prefix is prepended to all emitted statsd metrics - prefix: diff --git a/weaver/tests/network-setups/shared/charts/config-maps/scripts/initCC.sh b/weaver/tests/network-setups/shared/charts/config-maps/scripts/initCC.sh deleted file mode 100644 index f2482cb394..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/scripts/initCC.sh +++ /dev/null @@ -1,265 +0,0 @@ -#!/bin/bash - -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -INIT_REQUIRED="--init-required" -if [ "$CC_INIT_FCN" = "NA" ]; then - INIT_REQUIRED="" -fi - -if [ "$CC_END_POLICY" = "NA" ]; then - CC_END_POLICY="" -else - CC_END_POLICY="--signature-policy $CC_END_POLICY" -fi - -if [ "$CC_COLL_CONFIG" = "NA" ]; then - CC_COLL_CONFIG="" -else - CC_COLL_CONFIG="--collections-config $CC_COLL_CONFIG" -fi - -setGlobals() { - local USING_ORG="" - ORG=$1 - ORGMSP=`echo ${ORG:0:1} | tr '[a-z]' '[A-Z]'`${ORG:1}"MSP" - echo "Using organization ${ORG}, MSP: ${ORGMSP}" - export CORE_PEER_LOCALMSPID=${ORGMSP} - export CORE_PEER_TLS_ROOTCERT_FILE=/var/pvc1/peerOrganizations/${ORG}/peers/peer0-${ORG}-${NW_NAME}/tls/ca.crt - export CORE_PEER_MSPCONFIGPATH=/var/pvc1/peerOrganizations/${ORG}/users/Admin@${ORG}/msp - export CORE_PEER_ADDRESS=peer0-${ORG}-${NW_NAME}:${PORT} - - if [ "$VERBOSE" == "true" ]; then - env | grep CORE - fi -} - -# parsePeerConnectionParameters $@ -# Helper function that sets the peer connection parameters for a chaincode -# operation -parsePeerConnectionParameters() { - PEER_CONN_PARAMS="" - for org in $ORG_LIST; do - PEER_CONN_PARAMS=$PEER_CONN_PARAMS" --peerAddresses peer0-${org}-${NW_NAME}:${PORT} --tlsRootCertFiles /var/pvc1/peerOrganizations/${org}/peers/peer0-${org}-${NW_NAME}/tls/ca.crt" - done -} - -verifyResult() { - if [ $1 -ne 0 ]; then - echo "############# $2 .##########" - echo - exit 1 - fi -} - -# queryInstalled PEER ORG -queryInstalled() { - ORG=$1 - setGlobals $ORG - set -x - peer lifecycle chaincode queryinstalled >&~/log.txt - res=$? - set +x - grep ${CC_NAME} ~/log.txt > logtemp.txt - cat logtemp.txt - # PACKAGE_ID=$(sed -n "/${CC_NAME}/{s/^Package ID: //; s/, Label:.*$//; p;}" logtemp.txt) - verifyResult $res "Query installed on ${CORE_PEER_ADDRESS} has failed" - echo PackageID is ${PACKAGE_ID} - echo "===================== Query installed successful on ${CORE_PEER_ADDRESS} on channel ===================== " - echo - rm logtemp.txt -} - -# approveForMyOrg VERSION PEER ORG -approveForMyOrg() { - ORG=$1 - setGlobals $ORG - set -x - peer lifecycle chaincode approveformyorg -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA --channelID $CHANNEL_NAME --name ${CC_NAME} --version ${CC_VERSION} --init-required --package-id ${PACKAGE_ID} --sequence ${CC_SEQUENCE} >&~/log.txt - set +x - cat ~/log.txt - verifyResult $res "Chaincode definition approved on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' failed" - echo "===================== Chaincode definition approved on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -# checkCommitReadiness VERSION PEER ORG -checkCommitReadiness() { - ORG=$1 - setGlobals $ORG - echo "===================== Checking the commit readiness of the chaincode definition on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME'... ===================== " - local rc=1 - local COUNTER=1 - # continue to poll - # we either get a successful response, or reach MAX RETRY - while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do - sleep $DELAY - echo "Attempting to check the commit readiness of the chaincode definition on ${CORE_PEER_ADDRESS}, Retry after $DELAY seconds." - set -x - peer lifecycle chaincode checkcommitreadiness --channelID ${CHANNEL_NAME} --name ${CC_NAME} --version ${CC_VERSION} --sequence ${CC_SEQUENCE} ${INIT_REQUIRED} ${CC_END_POLICY} ${CC_COLL_CONFIG} --output json >&~/log.txt - res=$? - set +x - let rc=0 - for var in "$@"; do - if [ "$var" != "$ORG" ]; then - echo 'var...'$var - grep "$var" ~/log.txt &>/dev/null || let rc=1 - fi - done - COUNTER=$(expr $COUNTER + 1) - done - cat ~/log.txt - if test $rc -eq 0; then - echo "===================== Checking the commit readiness of the chaincode definition successful on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - else - echo - echo $'\e[1;31m'"############### After $MAX_RETRY attempts, Check commit readiness result on ${CORE_PEER_ADDRESS} is INVALID ###############!"$'\e[0m' - echo - exit 1 - fi -} - -# commitChaincodeDefinition VERSION PEER ORG (PEER ORG)... -commitChaincodeDefinition() { - parsePeerConnectionParameters - res=$? - verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " - - # while 'peer chaincode' command can get the orderer endpoint from the - # peer (if join was successful), let's supply it directly as we know - # it using the "-o" option - - set -x - peer lifecycle chaincode commit -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA --channelID $CHANNEL_NAME --name ${CC_NAME} $PEER_CONN_PARAMS --version ${CC_VERSION} --sequence ${CC_SEQUENCE} ${INIT_REQUIRED} ${CC_END_POLICY} ${CC_COLL_CONFIG} >&~/log.txt - res=$? - set +x - cat ~/log.txt - verifyResult $res "Chaincode definition commit failed on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' failed" - echo "===================== Chaincode definition committed on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -# queryCommitted ORG -queryCommitted() { - ORG=$1 - setGlobals $ORG - EXPECTED_RESULT="Version: ${CC_VERSION}, Sequence: ${CC_SEQUENCE}, Endorsement Plugin: escc, Validation Plugin: vscc" - echo "===================== Querying chaincode definition on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME'... ===================== " - local rc=1 - local COUNTER=1 - # continue to poll - # we either get a successful response, or reach MAX RETRY - while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do - sleep $DELAY - echo "Attempting to Query committed status on ${CORE_PEER_ADDRESS}, Retry after $DELAY seconds." - set -x - peer lifecycle chaincode querycommitted --channelID $CHANNEL_NAME --name ${CC_NAME} >&~/log.txt - res=$? - set +x - test $res -eq 0 && VALUE=$(cat ~/log.txt | grep -o '^Version: '$CC_VERSION', Sequence: [0-9], Endorsement Plugin: escc, Validation Plugin: vscc') - test "$VALUE" = "$EXPECTED_RESULT" && let rc=0 - COUNTER=$(expr $COUNTER + 1) - done - echo - cat ~/log.txt - if test $rc -eq 0; then - echo "===================== Query chaincode definition successful on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - echo - else - echo "############### After $MAX_RETRY attempts, Query chaincode definition result on ${CORE_PEER_ADDRESS} is INVALID ###############!" - echo - exit 1 - fi - sleep 1 -} - -chaincodeInvokeInit() { - parsePeerConnectionParameters - res=$? - verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " - - # while 'peer chaincode' command can get the orderer endpoint from the - # peer (if join was successful), let's supply it directly as we know - # it using the "-o" option - set -x - if [ "$CC_INIT_FCN" = "" ]; then - fcn_call='{"Args":['${CC_INIT_ARGS}']}' - else - fcn_call='{"function":"'${CC_INIT_FCN}'","Args":['${CC_INIT_ARGS}']}' - fi - - echo invoke fcn call:${fcn_call} - peer chaincode invoke -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n ${CC_NAME} $PEER_CONN_PARAMS --isInit -c ${fcn_call} >&~/log.txt - res=$? - set +x - cat ~/log.txt - verifyResult $res "Invoke execution on PEERS failed " - echo "===================== Invoke transaction successful on PEERS on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -CC_PKG_FILE=${CC_NAME}.tar.gz -for org in $ORG_LIST; do - res=1 - while [ $res -ne 0 ]; do - set -x - nc -zv -w30 "${CC_NAME}-${CHANNEL_NAME}-peer0-${org}-${NW_NAME}" 7052 - res=$? - set +x - sleep 5 - done - while [ ! -d "/var/pvc1/channel_ready/peer0-${org}-${NW_NAME}-${CHANNEL_NAME}" ]; do - echo "Could not find ${CHANNEL_NAME} on peer0-${org}-${NW_NAME}. Waiting..." - sleep 5 - done -done - -while [ ! -f "/var/pvc1/chaincodes/${CC_NAME}-${CHANNEL_NAME}-peer0-${org}-${NW_NAME}/pkgid" ]; do - echo "Waiting for chaincode to be installed on peer..." - sleep 5 -done - -echo "Chaincode Server Up, Running instantiation" - -## approve the definition -for org in $ORG_LIST; do - set -a - . /var/pvc1/chaincodes/${CC_NAME}-${CHANNEL_NAME}-peer0-${org}-${NW_NAME}/pkgid - set +a - PACKAGE_ID=$CHAINCODE_CCID - queryInstalled ${org} - approveForMyOrg ${org} -done - -TMP_PARAMS="" -for org in $ORGMSPS; do - TMP_PARAMS=$TMP_PARAMS" \""$org"\": true" -done -echo 'PARAMS..'${TMP_PARAMS} -for org in $ORG_LIST; do - checkCommitReadiness ${org} ${TMP_PARAMS} -done - -## commit the definition -commitChaincodeDefinition - -## query on all orgs to see that the definition committed successfully -for org in $ORG_LIST; do - queryCommitted ${org} -done - -## Invoke the chaincode - this does require that the chaincode have the 'initLedger' -## method defined -if [ "$CC_INIT_FCN" = "NA" ]; then - echo "===================== Chaincode initialization is not required ===================== " - echo -else - chaincodeInvokeInit -fi - -exit 0 diff --git a/weaver/tests/network-setups/shared/charts/config-maps/scripts/installCC.sh b/weaver/tests/network-setups/shared/charts/config-maps/scripts/installCC.sh deleted file mode 100644 index 2dd3dfd2a8..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/scripts/installCC.sh +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -apk add jq; - -########################## - -cd $GOPATH/src; -wget --header X-JFrog-Art-Api:$ARTIFACTORY_APIKEY $ARTIFACTORY_URL/$CC_PATH; -unzip $(basename $CC_PATH); -CC_PKG_FILE=${CC_NAME}.tar.gz; -CC_SRC_PATH=$GOPATH/src/$CC_NAME; -cp $CC_SRC_PATH/connection.json .; -cp $CC_SRC_PATH/metadata.json .; - -tmp=$(mktemp) -jq --arg a "$DEPLOYCC_NAME:7052" '.address = $a' connection.json > "$tmp" && mv "$tmp" connection.json -cat connection.json - -tar cfz code.tar.gz connection.json; -tar cfz ${CC_PKG_FILE} code.tar.gz metadata.json; -rm code.tar.gz metadata.json connection.json; -echo "===================== Chaincode is packaged on peer0.org${ORG} ===================== "; - -########################## - -res=1 -echo "" -while [ $res -ne 0 ]; do - set -x - nc -zv -w30 "${PEER_NAME}" 7051 - res=$? - set +x - sleep 5 -done -echo "Peer: ${PEER_NAME} UP" -res=1 -while [ $res -ne 0 ]; do - set -x - nc -zv -w30 "${ORDERER_NAME}" 7050 - res=$? - set +x - sleep 5 -done -echo "Orderer: ${ORDERER_NAME} UP" -echo "Installing Chaincode: ${CC_NAME} on ${CORE_PEER_ADDRESS}..." - -########################## - -echo; -set -x; -peer lifecycle chaincode install ${CC_PKG_FILE} >&~/log.txt; -res=$?; -set +x; -cat ~/log.txt -PACKAGE_ID=$(sed -n -e 's/^.*identifier: //p' ~/log.txt); -echo PackageID is $PACKAGE_ID -if [ $res -ne 0 ]; then - echo "############# Chaincode installation on ${CORE_PEER_ADDRESS} has failed ##########"; - exit 1; -fi; -echo "===================== Chaincode is installed on ${CORE_PEER_ADDRESS} ===================== "; - -########################## - -mkdir -p /var/pvc1/chaincodes/$DEPLOYCC_NAME; -echo "CHAINCODE_CCID="$PACKAGE_ID > /var/pvc1/chaincodes/$DEPLOYCC_NAME/pkgid; -echo "PACKAGE_ID: ${PACKAGE_ID} written to file ${DEPLOYCC_NAME}." -echo -exit 0 diff --git a/weaver/tests/network-setups/shared/charts/config-maps/templates/config.yaml b/weaver/tests/network-setups/shared/charts/config-maps/templates/config.yaml deleted file mode 100644 index 31f5e420d1..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/templates/config.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $fileName := printf "%s/configtx.yaml" $.Values.global.network.name -}} -{{- $cmname := printf "%s-configtx" $.Values.global.network.name -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $cmname }} -data: - configtx.yaml: |- -{{ $.Files.Get $fileName | indent 4}} ---- diff --git a/weaver/tests/network-setups/shared/charts/config-maps/templates/external-builder.yaml b/weaver/tests/network-setups/shared/charts/config-maps/templates/external-builder.yaml deleted file mode 100644 index 5c4e3e2f69..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/templates/external-builder.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: ConfigMap -metadata: - name: external-builder -data: - build: |- -{{ .Files.Get "external-service-builder/bin/build" | indent 4}} - detect: |- -{{ .Files.Get "external-service-builder/bin/detect" | indent 4}} - release: |- -{{ .Files.Get "external-service-builder/bin/release" | indent 4}} ---- diff --git a/weaver/tests/network-setups/shared/charts/config-maps/templates/generate-ccp.yaml b/weaver/tests/network-setups/shared/charts/config-maps/templates/generate-ccp.yaml deleted file mode 100644 index 478b0dc7f4..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/templates/generate-ccp.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: ConfigMap -metadata: - name: generate-ccp -data: - ccp-generate.sh: |- -{{ .Files.Get "generate-ccp/ccp-generate.sh" | indent 4}} - ccp-template.json: |- -{{ .Files.Get "generate-ccp/ccp-template.json" | indent 4}} ---- diff --git a/weaver/tests/network-setups/shared/charts/config-maps/templates/peer-config.yaml b/weaver/tests/network-setups/shared/charts/config-maps/templates/peer-config.yaml deleted file mode 100644 index e40b4d93d2..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/templates/peer-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: ConfigMap -metadata: - name: peer-config -data: - core.yaml: |- -{{ .Files.Get "peer-config/core.yaml" | indent 4}} ---- diff --git a/weaver/tests/network-setups/shared/charts/config-maps/templates/scripts.yaml b/weaver/tests/network-setups/shared/charts/config-maps/templates/scripts.yaml deleted file mode 100644 index b089860177..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/templates/scripts.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: ConfigMap -metadata: - name: cc-scripts -data: - initCC.sh: |- -{{ .Files.Get "scripts/initCC.sh" | indent 4}} - installCC.sh: |- -{{ .Files.Get "scripts/installCC.sh" | indent 4}} ---- diff --git a/weaver/tests/network-setups/shared/charts/config-maps/values.yaml b/weaver/tests/network-setups/shared/charts/config-maps/values.yaml deleted file mode 100644 index a5a1afbe5b..0000000000 --- a/weaver/tests/network-setups/shared/charts/config-maps/values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - name: network1 diff --git a/weaver/tests/network-setups/shared/charts/corda-net/.helmignore b/weaver/tests/network-setups/shared/charts/corda-net/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/corda-net/Chart.yaml b/weaver/tests/network-setups/shared/charts/corda-net/Chart.yaml deleted file mode 100644 index c87b59a1bd..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: corda-net -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle b/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle deleted file mode 100644 index 2dba283f73..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/build.gradle +++ /dev/null @@ -1,133 +0,0 @@ -buildscript { - Properties constants = new Properties() - file("$projectDir/./constants.properties").withInputStream { constants.load(it) } - - ext { - corda_release_group = constants.getProperty("cordaReleaseGroup") - corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup") - corda_release_version = constants.getProperty("cordaVersion") - corda_core_release_version = constants.getProperty("cordaCoreVersion") - corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion") - kotlin_version = constants.getProperty("kotlinVersion") - junit_version = constants.getProperty("junitVersion") - log4j_version = constants.getProperty("log4jVersion") - slf4j_version = constants.getProperty("slf4jVersion") - corda_platform_version = constants.getProperty("platformVersion").toInteger() - } - - repositories { - mavenLocal() - mavenCentral() - jcenter() - maven { url 'https://download.corda.net/maven/corda-releases' } - maven { url 'https://download.corda.net/maven/corda-dependencies' } - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version" - } -} - -apply plugin: 'net.corda.plugins.cordformation' - -sourceSets { - main { - resources { - srcDir rootProject.file("config/dev") - } - } -} - -dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - - // Corda dependencies. - cordaRuntime "$corda_release_group:corda-node-api:$corda_release_version" - cordaRuntime "$corda_release_group:corda:$corda_release_version" -} - -repositories { - mavenLocal() - jcenter() - mavenCentral() - maven { url 'https://download.corda.net/maven/corda' } - maven { url 'https://jitpack.io' } -} - -task ganache { - subprojects { - if (it.project.name != "clients") { - dependsOn jar - doLast { - copy { - from "${buildDir}/libs" - into "${rootDir}/build/libs" - } - } - } - } -} - -task deployNodes(type: net.corda.plugins.Cordform) { - Properties constants = new Properties() - file("$projectDir/./constants.properties").withInputStream { constants.load(it) } - - nodeDefaults { - projectCordapp { - deploy = false - } - } - node { - name "O=Notary,L=London,C=GB" - notary = [validating : false] - p2pPort 10002 - rpcSettings { - address("0.0.0.0:10003") - adminAddress("0.0.0.0:10043") - } - } - node { - name "O=PartyA,L=London,C=GB" - p2pPort 10005 - rpcSettings { - address("0.0.0.0:10006") - adminAddress("0.0.0.0:10046") - } - rpcUsers = [ - [ user: "clientUser1", "password": "test", "permissions": ["ALL"]], - [ user: "driverUser1", "password": "test", "permissions": ["ALL"]]] - } -} - -task prepareDockerNodes(type: net.corda.plugins.Dockerform, dependsOn: ['jar']) { - node { - name "O=Notary,L=London,C=GB" - notary = [validating: false] - p2pPort 10002 - rpcSettings { - address("0.0.0.0:10003") - adminAddress("0.0.0.0:10005") - } - projectCordapp { - deploy = false - } - cordapps.clear() - } - node { - name "O=PartyA,L=London,C=GB" - p2pPort 10004 - rpcSettings { - address("0.0.0.0:10003") - adminAddress("0.0.0.0:10005") - } - projectCordapp { - deploy = false - } - rpcUsers = [ - [ user: "clientUser1", "password": "test", "permissions": ["ALL"]], - [ user: "driverUser1", "password": "test", "permissions": ["ALL"]]] - } -} diff --git a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/constants.properties b/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/constants.properties deleted file mode 100644 index 5d9a7d1102..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/constants.properties +++ /dev/null @@ -1,16 +0,0 @@ -cordaReleaseGroup=net.corda -cordaCoreReleaseGroup=net.corda -cordaVersion=4.4 -cordaCoreVersion=4.4 -gradlePluginsVersion=5.0.4 -kotlinVersion=1.3.72 -junitVersion=4.12 -log4jVersion =2.11.2 -platformVersion=5 -slf4jVersion=1.7.25 -nettyVersion=4.1.22.Final - -notaryRpcAddress=localhost:10003 -notaryAdminRpcAddress=localhost:10043 -partyARpcAddress=localhost:10006 -partyAAdminRpcAddress=localhost:10046 diff --git a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/gradle.properties b/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/gradle.properties deleted file mode 100644 index 43212562d6..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/corda-gradle/gradle.properties +++ /dev/null @@ -1,4 +0,0 @@ -name=CordaNetwork -group=com.example -version=0.1 -kotlin.incremental=false diff --git a/weaver/tests/network-setups/shared/charts/corda-net/templates/_helpers.tpl b/weaver/tests/network-setups/shared/charts/corda-net/templates/_helpers.tpl deleted file mode 100644 index 162e9dd014..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/templates/_helpers.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "corda-net.labels" }} -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/corda-net/templates/cli.yaml b/weaver/tests/network-setups/shared/charts/corda-net/templates/cli.yaml deleted file mode 100644 index 790b32f4e6..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/templates/cli.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-volume" $.Values.network.name -}} -{{- $deployName := printf "%s-cli" $.Values.network.name -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $deployName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $deployName }} - template: - metadata: - labels: - name: {{ $deployName }} - app: {{ $deployName }} - app.kubernetes.io/component: "{{ $deployName }}" -{{- include "corda-net.labels" $ | indent 8 }} - spec: - containers: - - name: corda-cli - image: {{ printf "%s/%s:%s" $.Values.cli.image.repository $.Values.cli.image.name $.Values.cli.image.tag }} - imagePullPolicy: {{ $.Values.cli.image.pullPolicy }} - securityContext: - runAsUser: 0 - env: - - name: CORDA_HOST - value: {{ printf "%s-partya" $.Values.network.name }} - - name: CORDA_PORT - value: "10003" - volumeMounts: - - name: network-volume - mountPath: /var/pvc1 - command: ["/bin/sh", "-c", "sleep 6000"] - volumes: - - name: network-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - imagePullSecrets: - - name: {{ $.Values.cli.image.pullSecrets }} ---- diff --git a/weaver/tests/network-setups/shared/charts/corda-net/templates/gradle-build-map.yaml b/weaver/tests/network-setups/shared/charts/corda-net/templates/gradle-build-map.yaml deleted file mode 100644 index b808e28161..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/templates/gradle-build-map.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $cmName := printf "%s-gradle-build" $.Values.network.name -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $cmName }} -data: - build.gradle: |- -{{ .Files.Get "corda-gradle/build.gradle" | indent 4}} - gradle.properties: |- -{{ .Files.Get "corda-gradle/gradle.properties" | indent 4}} - constants.properties: |- -{{ .Files.Get "corda-gradle/constants.properties" | indent 4}} ---- diff --git a/weaver/tests/network-setups/shared/charts/corda-net/templates/network-pvc.yaml b/weaver/tests/network-setups/shared/charts/corda-net/templates/network-pvc.yaml deleted file mode 100644 index 413c4b13eb..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/templates/network-pvc.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ printf "%s-volume" $.Values.network.name }} - labels: - app.kubernetes.io/component: "Storage" -{{- include "corda-net.labels" $ | indent 4 }} -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi - storageClassName: {{ $.Values.network.storageClass }} - volumeMode: Filesystem ---- diff --git a/weaver/tests/network-setups/shared/charts/corda-net/templates/notary.yaml b/weaver/tests/network-setups/shared/charts/corda-net/templates/notary.yaml deleted file mode 100644 index bc432cfa71..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/templates/notary.yaml +++ /dev/null @@ -1,180 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-volume" $.Values.network.name -}} -{{- $deployName := printf "%s-notary" $.Values.network.name -}} -{{- $cmName := printf "%s-gradle-build" $.Values.network.name -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $deployName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $deployName }} - template: - metadata: - labels: - name: {{ $deployName }} - app: {{ $deployName }} - app.kubernetes.io/component: "{{ $deployName }}" -{{- include "corda-net.labels" $ | indent 8 }} - spec: - containers: - - name: notary - image: {{ $.Values.network.image.name }} - securityContext: - runAsUser: 0 - resources: - limits: - cpu: 900m - memory: "1Gi" - ports: - - containerPort: 10003 - - containerPort: 22022 - volumeMounts: - - name: network-volume - subPath: build/nodes/Notary/node.conf - mountPath: /etc/corda/node.conf - - name: network-volume - subPath: build/nodes/Notary/certificates - mountPath: /opt/corda/certificates - - name: network-volume - subPath: build/nodes/Notary/logs - mountPath: /opt/corda/logs - - name: network-volume - subPath: build/nodes/Notary/persistence - mountPath: /opt/corda/persistence - - name: network-volume - subPath: build/nodes/Notary/cordapps - mountPath: /opt/corda/cordapps - - name: network-volume - subPath: build/nodes/Notary/network-parameters - mountPath: /opt/corda/network-parameters - - name: network-volume - subPath: build/nodes/Notary/additional-node-infos - mountPath: /opt/corda/additional-node-infos - - name: network-volume - subPath: build/nodes/Notary/drivers - mountPath: /opt/corda/drivers - # - name: partya - # image: {{ $.Values.network.image.name }} - # ports: - # - containerPort: 10003 - # - containerPort: 22022 - # volumeMounts: - # - name: network-volume - # subPath: build/nodes/PartyA/node.conf - # mountPath: /etc/corda/node.conf - # - name: network-volume - # subPath: build/nodes/PartyA/certificates - # mountPath: /opt/corda/certificates - # - name: network-volume - # subPath: build/nodes/PartyA/logs - # mountPath: /opt/corda/logs - # - name: network-volume - # subPath: build/nodes/PartyA/persistence - # mountPath: /opt/corda/persistence - # - name: network-volume - # subPath: build/nodes/PartyA/cordapps - # mountPath: /opt/corda/cordapps - # - name: network-volume - # subPath: build/nodes/PartyA/network-parameters - # mountPath: /opt/corda/network-parameters - # - name: network-volume - # subPath: build/nodes/PartyA/additional-node-infos - # mountPath: /opt/corda/additional-node-infos - # - name: network-volume - # subPath: build/nodes/PartyA/drivers - # mountPath: /opt/corda/drivers - initContainers: - - name: init-container - image: {{ printf "%s:%s" $.Values.build.image.name $.Values.build.image.tag }} - resources: - limits: - cpu: 900m - memory: "2Gi" - env: - - name: ARTIFACTORY_USERNAME - valueFrom: - secretKeyRef: - name: artifactory-apikey - key: username - - name: ARTIFACTORY_PASSWORD - valueFrom: - secretKeyRef: - name: artifactory-apikey - key: apikey - - name: simpleAppVersion - value: "{{ $.Values.network.simpleAppVersion }}" - - name: interopAppVersion - value: "{{ $.Values.network.interopAppVersion }}" - - name: NW_NAME - value: {{ $.Values.network.name }} - volumeMounts: - - name: network-volume - mountPath: /var/pvc1 - - name: gradle-build-map - mountPath: /var/gradle-build - securityContext: - runAsUser: 0 - command: ["/bin/sh", "-c"] - args: ['echo; - apt-get update; - apt-get install -y curl; - echo "Running gradle task.."; - cp /var/gradle-build/* /var/pvc1/; - cd /var/pvc1; - mkdir -p /var/pvc1/build; - pwd; - ls -la; - if [ ! -f build.gradle ]; then - echo "gradle build file not found, Exiting..."; - exit 1; - fi; - gradle clean deployNodes prepareDockerNodes; - cat build/nodes/docker-compose.yml; - if [ ! -d build/nodes/PartyA ]; then - echo "Build unsuccesful, Exiting..."; - exit 1; - fi; - echo "Downloading CorDapps from Artifactory..."; - username=$ARTIFACTORY_USERNAME; - password=$ARTIFACTORY_PASSWORD; - mkdir -p /var/pvc1/artifacts; - set -x; - (cd /var/pvc1/artifacts && curl -u $username:$password -O https://na.artifactory.swg-devops.com:443/artifactory/res-dlt-interop-maven-local/com/cordaInteropApp/interop-contracts/$interopAppVersion/interop-contracts-$interopAppVersion.jar); - (cd /var/pvc1/artifacts && curl -u $username:$password -O https://na.artifactory.swg-devops.com:443/artifactory/res-dlt-interop-maven-local/com/cordaInteropApp/interop-workflows/$interopAppVersion/interop-workflows-$interopAppVersion.jar); - (cd /var/pvc1/artifacts && curl -u $username:$password -O https://na.artifactory.swg-devops.com:443/artifactory/res-dlt-interop-maven-local/com/cordaSimpleApplication/contracts-kotlin/$simpleAppVersion/contracts-kotlin-$simpleAppVersion.jar); - (cd /var/pvc1/artifacts && curl -u $username:$password -O https://na.artifactory.swg-devops.com:443/artifactory/res-dlt-interop-maven-local/com/cordaSimpleApplication/workflows-kotlin/$simpleAppVersion/workflows-kotlin-$simpleAppVersion.jar); - set +x; - cd /var/pvc1/; - cp /var/pvc1/artifacts/contracts-kotlin-$simpleAppVersion.jar build/nodes/Notary/cordapps; - cp /var/pvc1/artifacts/contracts-kotlin-$simpleAppVersion.jar build/nodes/PartyA/cordapps; - cp /var/pvc1/artifacts/workflows-kotlin-$simpleAppVersion.jar build/nodes/Notary/cordapps; - cp /var/pvc1/artifacts/workflows-kotlin-$simpleAppVersion.jar build/nodes/PartyA/cordapps; - - cp /var/pvc1/artifacts/interop-contracts-$interopAppVersion.jar build/nodes/Notary/cordapps; - cp /var/pvc1/artifacts/interop-contracts-$interopAppVersion.jar build/nodes/PartyA/cordapps; - cp /var/pvc1/artifacts/interop-workflows-$interopAppVersion.jar build/nodes/Notary/cordapps; - cp /var/pvc1/artifacts/interop-workflows-$interopAppVersion.jar build/nodes/PartyA/cordapps; - - sed -i "s/notary:10003/0.0.0.0:10003/g" build/nodes/Notary/node.conf; - sed -i "s/notary:10005/0.0.0.0:10005/g" build/nodes/Notary/node.conf; - sed -i "s/partya:10003/0.0.0.0:10003/g" build/nodes/PartyA/node.conf; - sed -i "s/partya:10005/0.0.0.0:10005/g" build/nodes/PartyA/node.conf; - sed -i "s/p2pAddress=\"notary:10002\"/p2pAddress=\"${NW_NAME}-notary:10002\"/g" build/nodes/PartyA/node.conf; - sed -i "s/p2pAddress=\"partya:10004\"/p2pAddress=\"${NW_NAME}-partya:10004\"/g" build/nodes/PartyA/node.conf; - echo;'] - volumes: - - name: network-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: gradle-build-map - configMap: - name: {{ $cmName }} ---- diff --git a/weaver/tests/network-setups/shared/charts/corda-net/templates/party.yaml b/weaver/tests/network-setups/shared/charts/corda-net/templates/party.yaml deleted file mode 100644 index 0160ca028e..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/templates/party.yaml +++ /dev/null @@ -1,88 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-volume" $.Values.network.name -}} -{{- $deployName := printf "%s-partya" $.Values.network.name -}} -{{- $cmName := printf "%s-gradle-build" $.Values.network.name -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $deployName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $deployName }} - template: - metadata: - labels: - name: {{ $deployName }} - app: {{ $deployName }} - app.kubernetes.io/component: "{{ $deployName }}" -{{- include "corda-net.labels" $ | indent 8 }} - spec: - containers: - - name: partya - image: {{ $.Values.network.image.name }} - securityContext: - runAsUser: 0 - resources: - limits: - cpu: 400m - memory: "1Gi" - ports: - - containerPort: 10003 - - containerPort: 22022 - volumeMounts: - - name: network-volume - subPath: build/nodes/PartyA/node.conf - mountPath: /etc/corda/node.conf - - name: network-volume - subPath: build/nodes/PartyA/certificates - mountPath: /opt/corda/certificates - - name: network-volume - subPath: build/nodes/PartyA/logs - mountPath: /opt/corda/logs - - name: network-volume - subPath: build/nodes/PartyA/persistence - mountPath: /opt/corda/persistence - - name: network-volume - subPath: build/nodes/PartyA/cordapps - mountPath: /opt/corda/cordapps - - name: network-volume - subPath: build/nodes/PartyA/network-parameters - mountPath: /opt/corda/network-parameters - - name: network-volume - subPath: build/nodes/PartyA/additional-node-infos - mountPath: /opt/corda/additional-node-infos - - name: network-volume - subPath: build/nodes/PartyA/drivers - mountPath: /opt/corda/drivers - initContainers: - - name: init-container - image: alpine:latest - env: - - name: version - value: "{{ $.Values.network.interopAppVersion }}" - volumeMounts: - - name: network-volume - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['echo; - cd /var/pvc1/; - while [ ! -f /var/pvc1/build/nodes/PartyA/cordapps/interop-workflows-$version.jar ]; do - echo "Waiting for init to be completed..."; - sleep 5; - done; - echo;'] - volumes: - - name: network-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: gradle-build-map - configMap: - name: {{ $cmName }} ---- diff --git a/weaver/tests/network-setups/shared/charts/corda-net/templates/service.yaml b/weaver/tests/network-setups/shared/charts/corda-net/templates/service.yaml deleted file mode 100644 index 3d75c29a11..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/templates/service.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $notaryHost := printf "%s-notary" $.Values.network.name -}} -{{- $partyaHost := printf "%s-partya" $.Values.network.name -}} - -apiVersion: v1 -kind: Service -metadata: - name: {{ $notaryHost }} - labels: - {{- include "corda-net.labels" . | nindent 4 }} -spec: - type: ClusterIP - ports: - - port: 10003 - targetPort: 10003 - protocol: TCP - name: port1 - - port: 22022 - targetPort: 22022 - protocol: TCP - name: port2 - selector: - name: {{ $notaryHost }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ $partyaHost }} - labels: - {{- include "corda-net.labels" . | nindent 4 }} -spec: - type: ClusterIP - ports: - - port: 10003 - targetPort: 10003 - protocol: TCP - name: port1 - - port: 22022 - targetPort: 22022 - protocol: TCP - name: port2 - selector: - name: {{ $partyaHost }} ---- diff --git a/weaver/tests/network-setups/shared/charts/corda-net/values.yaml b/weaver/tests/network-setups/shared/charts/corda-net/values.yaml deleted file mode 100644 index d41a501144..0000000000 --- a/weaver/tests/network-setups/shared/charts/corda-net/values.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.cloud9.ibm.com" - name: corda-net1 - simpleAppVersion: 0.4 - interopAppVersion: 0.6 - storageClass: nfs-storage - image: - name: corda/corda-zulu-java1.8-4.4 - -cli: - image: - repository: res-dlt-interop-docker-local.artifactory.swg-devops.com - pullPolicy: Always - pullSecrets: interop-artifactory - name: dlt-interop/corda-cli - tag: latest - -build: - image: - name: gradle - tag: 5.6.0-jdk8 - # name: openjdk - # tag: 8-jdk-alpine diff --git a/weaver/tests/network-setups/shared/charts/deploycc/.helmignore b/weaver/tests/network-setups/shared/charts/deploycc/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/deploycc/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/deploycc/Chart.yaml b/weaver/tests/network-setups/shared/charts/deploycc/Chart.yaml deleted file mode 100644 index 0d548f4910..0000000000 --- a/weaver/tests/network-setups/shared/charts/deploycc/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: deploycc -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/deploycc/templates/deployment.yaml b/weaver/tests/network-setups/shared/charts/deploycc/templates/deployment.yaml deleted file mode 100644 index 5a39ec9974..0000000000 --- a/weaver/tests/network-setups/shared/charts/deploycc/templates/deployment.yaml +++ /dev/null @@ -1,125 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} - -{{- range $.Values.chaincodes }} -{{- $chaincode := . }} -{{- $ccImage := printf "%s/%s:%s" $.Values.docker.imageRegistry $chaincode.imageName $chaincode.imageTag -}} -{{- $ordererName := printf "%s-orderers-%s" $chaincode.ordererName $.Values.global.network.name -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- $orgMSP := .mspId -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -{{- $peerAddress := printf "%s:7051" $peerName -}} -{{- $deployccName := printf "%s-%s-%s" $chaincode.name $chaincode.channelName $peerName -}} - -#---------------- Chaincode Deployment --------------------- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $deployccName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $deployccName }} - template: - metadata: - labels: - name: {{ $deployccName }} - app: {{ $deployccName }} - spec: - volumes: - - name: pvc1 - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: cc-scripts - configMap: - name: cc-scripts - imagePullSecrets: - - name: {{ $.Values.docker.imagePullSecrets }} - containers: - - image: {{ $ccImage }} - name: chaincode - imagePullPolicy: IfNotPresent - command: ["sh", "-c"] - args: ['set -a; - . /var/env/pkgid; - set +a; - echo $CHAINCODE_CCID; - ./$CC_NAME'] - env: - - name: CC_NAME - value: {{ $chaincode.name }} - - name: EXTERNAL_SERVICE - value: "true" - - name: CHAINCODE_ADDRESS - value: "0.0.0.0:7052" - ports: - - containerPort: 7052 - volumeMounts: - - name: pvc1 - subPath: {{ printf "chaincodes/%s" $deployccName }} - mountPath: /var/env - initContainers: - - name: cc-install - image: hyperledger/fabric-tools:2.1 - env: - - name: ARTIFACTORY_URL - value: {{ $.Values.artifactory.url }} - - name: ARTIFACTORY_APIKEY - valueFrom: - secretKeyRef: - name: {{ $.Values.artifactory.secret }} - key: {{ $.Values.artifactory.secretKey }} - - name: CC_PATH - value: {{ $chaincode.artifactoryPath }} - - name: CC_NAME - value: {{ $chaincode.name }} - - name: CC_VERSION - value: "{{ $chaincode.version }}" - - name: CC_LANGUAGE - value: {{ $chaincode.lang }} - - name: ORG - value: {{ $orgName }} - - name: CORE_PEER_LOCALMSPID - value: {{ $orgMSP }} - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: {{ printf "/var/pvc1/peerOrganizations/%s/peers/%s/tls/ca.crt" $orgName $peerName }} - - name: CORE_PEER_MSPCONFIGPATH - value: {{ printf "/var/pvc1/peerOrganizations/%s/users/Admin@%s/msp" $orgName $orgName }} - - name: CORE_PEER_ADDRESS - value: {{ $peerAddress }} - - name: PEER_NAME - value: {{ $peerName }} - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: ORDERER_NAME - value: {{ $ordererName }} - - name: ORDERER_URL - value: {{ printf "%s:7050" $ordererName }} - - name: ORDERER_CA - value: {{ printf "/var/pvc1/ordererOrganizations/orderer/orderers/%s/tls/ca.crt" $ordererName }} - - name: CHANNEL_NAME - value: {{ $chaincode.channelName }} - - name: NW_NAME - value: {{ $.Values.global.network.name }} - - name: DEPLOYCC_NAME - value: {{ $deployccName }} - volumeMounts: - - name: pvc1 - mountPath: /var/pvc1 - - name: cc-scripts - mountPath: /var/cc-scripts - command: ["/bin/sh", "-c"] - args: ["bash /var/cc-scripts/installCC.sh"] - ---- -{{- end }} -{{- end }} -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/deploycc/templates/job.yaml b/weaver/tests/network-setups/shared/charts/deploycc/templates/job.yaml deleted file mode 100644 index 1d1a6884eb..0000000000 --- a/weaver/tests/network-setups/shared/charts/deploycc/templates/job.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- range $.Values.chaincodes }} -{{- $chaincode := . }} -{{- $jobName := printf "instantiate-%s-%s-%s" $chaincode.name $chaincode.channelName $.Values.global.network.name -}} -{{- $ordererName := printf "%s-orderers-%s" $chaincode.ordererName $.Values.global.network.name -}} - -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ $jobName }} -spec: - template: - spec: - volumes: - - name: pvc1 - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: cc-scripts - configMap: - name: cc-scripts - containers: - - name: cc-instantiate - image: hyperledger/fabric-tools:2.1 - env: - - name: CC_NAME - value: {{ $chaincode.name }} - - name: CC_VERSION - value: "{{ $chaincode.version }}" - - name: CC_LANGUAGE - value: {{ $chaincode.lang }} - - name: CC_INIT_FCN - value: {{ $chaincode.initFn }} - - name: CC_INIT_ARGS - value: '{{ $chaincode.initArgs }}' - - name: CC_END_POLICY - value: "{{ $chaincode.endorsementPolicy }}" - - name: CC_COLL_CONFIG - value: {{ $chaincode.collConfig }} - - name: CC_SEQUENCE - value: "{{ $chaincode.sequence }}" - - name: MAX_RETRY - value: "5" - - name: DELAY - value: "3" - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: ORDERER_NAME - value: {{ $ordererName }} - - name: ORDERER_URL - value: {{ printf "%s:7050" $ordererName }} - - name: ORDERER_CA - value: {{ printf "/var/pvc1/ordererOrganizations/orderer/orderers/%s/tls/ca.crt" $ordererName }} - - name: CHANNEL_NAME - value: {{ $chaincode.channelName }} - - name: ORG_LIST - value: "{{ $.Values.global.network.orgList }}" - - name: ORGMSPS - value: "{{ $.Values.global.network.orgMSPList }}" - - name: NW_NAME - value: {{ $.Values.global.network.name }} - - name: PORT - value: "7051" - volumeMounts: - - name: pvc1 - mountPath: /var/pvc1 - - name: cc-scripts - mountPath: /var/cc-scripts - command: ["/bin/sh", "-c"] - args: ['bash /var/cc-scripts/initCC.sh'] - restartPolicy: Never - backoffLimit: 1 ---- -{{ end -}} diff --git a/weaver/tests/network-setups/shared/charts/deploycc/templates/service.yaml b/weaver/tests/network-setups/shared/charts/deploycc/templates/service.yaml deleted file mode 100644 index a14b5d85dd..0000000000 --- a/weaver/tests/network-setups/shared/charts/deploycc/templates/service.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- range $.Values.chaincodes }} -{{- $chaincode := . }} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -{{- $deployccName := printf "%s-%s-%s" $chaincode.name $chaincode.channelName $peerName -}} - -apiVersion: v1 -kind: Service -metadata: - name: {{ $deployccName }} - labels: - app: {{ $deployccName }} -spec: - ports: - - name: grpc - port: 7052 - targetPort: 7052 - selector: - app: {{ $deployccName }} ---- - -{{- end }} -{{- end }} -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/deploycc/values.yaml b/weaver/tests/network-setups/shared/charts/deploycc/values.yaml deleted file mode 100644 index 67054c4fc2..0000000000 --- a/weaver/tests/network-setups/shared/charts/deploycc/values.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.cloud9.ibm.com" - name: network1 - orgList: "org1" - orgMSPList: "Org1MSP" - orgs: - - name: org1 - mspId: Org1MSP - peers: - - name: peer0 - -docker: - imageRegistry: res-dlt-interop-docker-local.artifactory.swg-devops.com - imagePullSecrets: interop-artifactory - -artifactory: - url: https://na.artifactory.swg-devops.com/artifactory - secret: artifactory-apikey - secretKey: apikey - -chaincodes: - - name: sacc - channelName: mychannel - ordererName: ord0 - version: v1.0 - lang: golang - imageName: dlt-interop/chaincodes/sacc - imageTag: "2.0" - artifactoryPath: res-dlt-interop-generic-local/fabric-test-environment/sacc.zip - initFn: "" - initArgs: '"a","10"' - endorsementPolicy: NA - collConfig: NA - sequence: 1 diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/.helmignore b/weaver/tests/network-setups/shared/charts/fabric-ca/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/Chart.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/Chart.yaml deleted file mode 100644 index 3e93cd415a..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/Chart.yaml +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-ca -description: A Helm chart for Kubernetes -dependencies: -- name: postgresdb - version: "0.1.0" - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/.helmignore b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/.helmignore deleted file mode 100644 index dbe1611419..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/.helmignore +++ /dev/null @@ -1,24 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ -templates/postgress-pvc.yaml diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/Chart.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/Chart.yaml deleted file mode 100644 index deb3ea704e..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: postgresdb -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/NOTES.txt b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/NOTES.txt deleted file mode 100644 index e239c9fc62..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/NOTES.txt +++ /dev/null @@ -1,8 +0,0 @@ -Thank you for installaing {{ .Chart.Name }}. - -Your release is named {{ .Release.Name }}. - -To learn more about the release try: - - $ helm status {{ .Release.Name }} - $ helm get all {{ .Release.Name }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/_helpers.tpl b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/_helpers.tpl deleted file mode 100644 index 4835e8fd07..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/_helpers.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "fabric-network.labels" }} -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-route.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-route.yaml deleted file mode 100644 index 85f769be88..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-route.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (eq $.Values.global.cluster "OpenShift") -}} -{{- if $.Values.global.network.postgres -}} -{{- $name := printf "postgresql-%s" $.Values.global.network.name}} -apiVersion: v1 -kind: Route -metadata: - name: {{ printf "%s-route" $name }} - labels: - app.kubernetes.io/component: "Peer" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - host: {{ printf "%s.%s" $name $.Values.global.network.domain.cluster }} - port: - targetPort: grpc - to: - kind: Service - name: {{ $name }} - tls: - termination: edge - wildcardPolicy: None ---- -{{- end -}} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-secret.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-secret.yaml deleted file mode 100644 index 85d4862ce2..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-secret.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.global.network.postgres -}} -apiVersion: v1 -kind: Secret -metadata: - name: {{ printf "postgresql-%s" $.Values.global.network.name }} - annotations: - app.kubernetes.io/component: "CA_DB" -{{ include "fabric-network.labels" $ | indent 4 }} - labels: - app: postgresql -type: Opaque -data: - postgresql-password: {{ $.Values.global.network.postgres.admin.password | b64enc | quote }} ---- -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-service.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-service.yaml deleted file mode 100644 index ccaf1763eb..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-service.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.global.network.postgres -}} -{{- $name := printf "postgresql-%s" $.Values.global.network.name}} -apiVersion: v1 -kind: Service -metadata: - name: {{ $name }} - annotations: - app.kubernetes.io/component: "CA_DB" -{{ include "fabric-network.labels" $ | indent 4 }} - labels: - app: {{ $name }} -spec: - type: ClusterIP - ports: - - name: tcp-postgresql - port: 5432 - targetPort: tcp-postgresql - selector: - app: {{ $name }} - role: main ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ $name }}-headless - annotations: - app.kubernetes.io/component: "CA DB" -{{ include "fabric-network.labels" $ | indent 4 }} - labels: - app: {{ $name }} -spec: - type: ClusterIP - clusterIP: None - ports: - - name: tcp-postgresql - port: 5432 - targetPort: tcp-postgresql - selector: - app: {{ $name }} ---- -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-statefulset.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-statefulset.yaml deleted file mode 100644 index 64d0cf1f23..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgres-statefulset.yaml +++ /dev/null @@ -1,123 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.global.network.postgres -}} -{{- $name := printf "postgresql-%s" $.Values.global.network.name}} -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ $name }} - annotations: - app.kubernetes.io/component: "CA_DB" -{{ include "fabric-network.labels" $ | indent 4 }} - labels: - app: {{ $name }} -spec: - serviceName: {{ $name }}-headless - replicas: 1 - updateStrategy: - type: RollingUpdate - selector: - matchLabels: - app: {{ $name }} - role: main - template: - metadata: - name: {{ $name }} - labels: - app: {{ $name }} - role: main - spec: - {{- if $.Values.global.postgresdb.securityContext.enabled }} - securityContext: - runAsUser: {{ $.Values.global.postgresdb.securityContext.runAsUser }} - {{- end }} - containers: - - name: {{ $name }} - image: {{ printf "%s:%s" $.Values.global.images.postgres.name $.Values.global.images.postgres.version }} - imagePullPolicy: "IfNotPresent" - resources: - requests: - cpu: 200m - memory: 256Mi - env: - - name: BITNAMI_DEBUG - value: "false" - - name: POSTGRESQL_PORT_NUMBER - value: "5432" - - name: POSTGRESQL_VOLUME_DIR - value: "/bitnami/postgresql" - - name: PGDATA - value: "/bitnami/postgresql/data" - - name: POSTGRES_USER - value: {{ $.Values.global.network.postgres.admin.user }} - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ $name }} - key: postgresql-password - - name: POSTGRES_DB - value: {{ $.Values.global.network.postgres.admin.db }} - - name: POSTGRESQL_ENABLE_LDAP - value: "no" - ports: - - name: tcp-postgresql - containerPort: 5432 - livenessProbe: - exec: - command: - - /bin/sh - - -c - - exec pg_isready -U {{ $.Values.global.network.postgres.admin.user | quote }} -d {{ $.Values.global.network.postgres.admin.db }} -h 127.0.0.1 -p 5432 - initialDelaySeconds: 30 - periodSeconds: 60 - timeoutSeconds: 10 - successThreshold: 1 - failureThreshold: 30 - readinessProbe: - exec: - command: - - /bin/sh - - -c - - -e - - | - exec pg_isready -U {{ $.Values.global.network.postgres.admin.user | quote }} -d {{ $.Values.global.network.postgres.admin.db }} -h 127.0.0.1 -p 5432 - [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ] - initialDelaySeconds: 30 - periodSeconds: 60 - timeoutSeconds: 10 - successThreshold: 1 - failureThreshold: 30 - volumeMounts: - - name: dshm - mountPath: /dev/shm - {{- if $.Values.global.network.postgres.pvc }} - - name: {{ $name }}-data - mountPath: /bitnami/postgresql - subPath: - {{- end }} - volumes: - - name: dshm - emptyDir: - medium: Memory - sizeLimit: 1Gi - {{- if $.Values.global.network.postgres.pvc }} - - name: {{ $name }}-data - persistentVolumeClaim: - claimName: {{ $name }}-data - {{- end }} - - # volumeClaimTemplates: - # - metadata: - # name: {{ $name }}-data - # spec: - # accessModes: - # - "ReadWriteOnce" - # resources: - # requests: - # storage: {{ $.Values.global.network.postgres.storage | quote }} ---- -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgress-pvc.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgress-pvc.yaml deleted file mode 100644 index d14ec796ec..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/templates/postgress-pvc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.global.network.postgres.pvc -}} -{{- $name := printf "postgresql-%s" $.Values.global.network.name}} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ $name }}-data - labels: - app.kubernetes.io/component: "Storage" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: {{ $.Values.global.network.postgres.storage | quote }} - storageClassName: {{ $.Values.global.network.storageClass }} - volumeMode: Filesystem ---- -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/values.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/values.yaml deleted file mode 100644 index edef219b1d..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/charts/postgresdb/values.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.cloud9.ibm.com" - name: network1 - storageClass: nfs-storage - postgres: - expose: true - pvc: true - admin: - user: "pgadmin" - password: "pgadminpw" - db: "default" - storage: "500Mi" - - cluster: Kubernetes - postgresdb: - securityContext: - enabled: true - runAsUser: 1001 - - images: - postgres: - name: docker.io/bitnami/postgresql - version: 11.7.0-debian-10-r26 diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/NOTES.txt b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/NOTES.txt deleted file mode 100644 index e239c9fc62..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/NOTES.txt +++ /dev/null @@ -1,8 +0,0 @@ -Thank you for installaing {{ .Chart.Name }}. - -Your release is named {{ .Release.Name }}. - -To learn more about the release try: - - $ helm status {{ .Release.Name }} - $ helm get all {{ .Release.Name }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/_helpers.tpl b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/_helpers.tpl deleted file mode 100644 index 4835e8fd07..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/_helpers.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "fabric-network.labels" }} -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-deployment.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-deployment.yaml deleted file mode 100644 index 106e074d28..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-deployment.yaml +++ /dev/null @@ -1,78 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- if .ca.deploy -}} -{{- $caName := printf "ca-%s-%s" $orgName $.Values.global.network.name -}} -{{- $dbName := printf "ca_%s_%s" $orgName $.Values.global.network.name -}} -{{- $dbHost := printf "postgresql-%s" $.Values.global.network.name }} -{{- $dbSource := printf "host=postgresql-%s port=5432 user=%s password=%s dbname=%s sslmode=disable" $.Values.global.network.name $.Values.global.network.postgres.admin.user $.Values.global.network.postgres.admin.password $dbName -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $caName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $caName }} - template: - metadata: - labels: -{{ include "fabric-network.labels" $ | indent 8 }} - app.kubernetes.io/component: "CA" - name: {{ $caName }} - app: {{ $caName }} - spec: - containers: - - name: {{ $caName }} - image: {{ printf "%s:%s" $.Values.global.images.ca.name $.Values.global.images.ca.version}} - command: ["sh", "-c"] - args: ['echo; - res=1; - while [ $res -ne 0 ]; do - set -x; - nc -zv -w60 {{ $dbHost }} 5432; - res=$?; - set +x; - echo "Waiting for Postgres server to be up..."; - sleep 30; - done; - echo "Postgres Server: {{ $dbHost }}:5432 Up."; - sleep 5; - fabric-ca-server start -b admin:adminpw -d;'] - ports: - - containerPort: 7054 - env: - - name: FABRIC_CA_HOME - value: /etc/hyperledger/fabric-ca-server - - name: FABRIC_CA_SERVER_CA_NAME - value: {{ $caName }} - - name: FABRIC_CA_SERVER_TLS_ENABLED - value: "true" - - name: FABRIC_CA_SERVER_PORT - value: "7054" - - name: FABRIC_CA_SERVER_CSR_CN - value: {{ $caName }} - - name: FABRIC_CA_SERVER_CSR_HOSTS - value: {{ $caName }} - - name: FABRIC_CA_SERVER_DB_TYPE - value: postgres - - name: FABRIC_CA_SERVER_DB_DATASOURCE - value: '{{ $dbSource }}' - volumeMounts: - - name: fabric-ca-volume - subPath: {{ printf "fabric-ca/%s" $orgName }} - mountPath: /etc/hyperledger/fabric-ca-server - volumes: - - name: fabric-ca-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} ---- -{{- end -}} -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-ingress.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-ingress.yaml deleted file mode 100644 index 315211c3f2..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-ingress.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (ne $.Values.global.cluster "OpenShift") -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- if (and .ca.deploy .ca.expose) -}} -{{- $caName := printf "ca-%s-%s" $orgName $.Values.global.network.name -}} -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress -metadata: - name: {{ printf "%s-ingress" $caName}} - annotations: - kubernetes.io/ingress.class: "nginx" - ingress.kubernetes.io/ssl-passthrough: "true" - labels: - app.kubernetes.io/component: "CA" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - rules: - - host: {{ printf "%s.%s" $caName $.Values.global.network.domain.cluster }} - http: - paths: - - path: / - backend: - serviceName: {{ $caName }} - servicePort: https ---- -{{- end -}} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-route.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-route.yaml deleted file mode 100644 index a10c2d65bc..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-route.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (eq $.Values.global.cluster "OpenShift") -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- if (and .ca.deploy .ca.expose) -}} -{{- $caName := printf "ca-%s-%s" $orgName $.Values.global.network.name -}} -apiVersion: v1 -kind: Route -metadata: - name: {{ printf "%s-route" $caName }} - labels: - app.kubernetes.io/component: "CA" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - host: {{ printf "%s.%s" $caName $.Values.global.network.domain.cluster }} - port: - targetPort: grpc - to: - kind: Service - name: {{ $caName }} - tls: - termination: passthrough - wildcardPolicy: None ---- -{{- end -}} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-service.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-service.yaml deleted file mode 100644 index aff8f826e3..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/ca-service.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- if .ca.deploy -}} -{{- $caName := printf "ca-%s-%s" $orgName $.Values.global.network.name -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ $caName }} - labels: - run: {{ $caName }} -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - type: ClusterIP - selector: - name: {{ $caName }} - ports: - - protocol: TCP - port: 7054 - name: https ---- -{{- end -}} -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-artifacts.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-artifacts.yaml deleted file mode 100644 index 77d88f422f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-artifacts.yaml +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- $configMapName := printf "%s-configtx" $.Values.global.network.name -}} -{{- range $.Values.global.network.channels }} -apiVersion: batch/v1 -kind: Job -metadata: - name: gen-artifacts-{{ $.Values.global.network.name }} -spec: - template: - spec: - volumes: - - name: volume1 - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: configtx - configMap: - name: {{ $configMapName }} - containers: - - name: gen-artifacts - image: {{ printf "%s:%s" $.Values.global.images.fabricTools.name $.Values.global.images.fabricTools.version }} - env: - - name: CHANNEL_NAME - value: {{ .name }} - - name: ORGMSPS - value: "{{ $.Values.global.network.orgMSPList }}" - - name: CHANNEL_PROFILE - value: {{ .profile }} - - name: FABRIC_CFG_PATH - value: /var/pvc1 - volumeMounts: - - name: volume1 - mountPath: /var/pvc1 - - name: configtx - mountPath: /var/fabric_cfg - command: ["/bin/sh", "-c"] - args: ['mkdir -p /var/pvc1/channel-artifacts; - cp /var/fabric_cfg/configtx.yaml /var/pvc1/; - - while [ ! -d "/var/pvc1/peerOrganizations/org1/msp/cacerts" ]; do - sleep 5; - done; - sleep 5; - - echo "Generating channel-artifacts"; - set -x; - configtxgen -profile ${CHANNEL_PROFILE} -outputCreateChannelTx /var/pvc1/channel-artifacts/${CHANNEL_NAME}.tx -channelID $CHANNEL_NAME; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to generate channel configuration transaction..."; - exit 1; - fi; - - for orgmsp in $ORGMSPS; do - echo "####### Generating anchor peer update for ${orgmsp} ##########"; - set -x; - configtxgen -profile ${CHANNEL_PROFILE} -outputAnchorPeersUpdate /var/pvc1/channel-artifacts/${orgmsp}anchors.tx -channelID $CHANNEL_NAME -asOrg ${orgmsp}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to generate anchor peer update for ${orgmsp}..."; - exit 1; - fi; - echo; - done;'] - restartPolicy: Never - backoffLimit: 4 ---- -{{ end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-crypto-ord.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-crypto-ord.yaml deleted file mode 100644 index e7b67c8d35..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-crypto-ord.yaml +++ /dev/null @@ -1,157 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- $caName := printf "ca-orderers-%s" $.Values.global.network.name -}} -{{- range $.Values.global.network.orderers }} -{{- $nodeName := printf "%s-orderers-%s" .name $.Values.global.network.name -}} -apiVersion: batch/v1 -kind: Job -metadata: - name: gen-crypto-ord-{{ $.Values.global.network.name }} -spec: - template: - spec: - volumes: - - name: volume1 - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - containers: - - name: gen-crypto-ord - image: {{ printf "%s:%s" $.Values.global.images.ca.name $.Values.global.images.ca.version}} - env: - - name: DOMAIN - value: orderer - - name: NODE_HOSTNAME - value: {{ $nodeName }} - - name: CA_NAME - value: {{ $caName }} - - name: CA_URL - value: {{ printf "%s:7054" $caName }} - - name: CA_CERT_FILE - value: {{ printf "%s-7054-%s.pem" $caName $caName }} - - name: FABRIC_CA_CLIENT_HOME - value: /var/pvc1/ordererOrganizations/orderer - - name: TLS_CACERT_PATH - value: /var/pvc1/fabric-ca/orderer/tls-cert.pem - volumeMounts: - - name: volume1 - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['echo; - res=1; - while [ $res -ne 0 ]; do - set -x; - nc -zv -w60 $CA_NAME 7054; - res=$?; - set +x; - sleep 5; - done; - echo "CA Server: $CA_NAME:7054 Up."; - sleep 5; - - echo "Enroll the CA admin"; - echo; - mkdir -p ${FABRIC_CA_CLIENT_HOME}; - - export FABRIC_CA_CLIENT_HOME=${FABRIC_CA_CLIENT_HOME}; - set -x; - fabric-ca-client enroll -u https://admin:adminpw@${CA_URL} --caname ${CA_NAME} --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll admin..."; - exit 1; - fi; - - echo "NodeOUs:\n Enable: true\n ClientOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: client\n PeerOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: peer\n AdminOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: admin\n OrdererOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: orderer" > ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml; - - - echo; - echo "Register orderer"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name orderer --id.secret ordererpw --id.type orderer --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to register orderer..."; - exit 1; - fi; - - echo; - echo "Register the orderer admin"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name ordererAdmin --id.secret ordererAdminpw --id.type admin --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to register ordererAdmin..."; - exit 1; - fi; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers/${DOMAIN}; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}; - - echo; - echo "## Generate the orderer msp"; - echo; - set -x; - fabric-ca-client enroll -u https://orderer:ordererpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp --csr.hosts ${NODE_HOSTNAME} --csr.hosts localhost --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll orderer..."; - exit 1; - fi; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp/config.yaml; - - echo; - echo "## Generate the orderer-tls certificates"; - echo; - set -x; - fabric-ca-client enroll -u https://orderer:ordererpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls --enrollment.profile tls --csr.hosts ${NODE_HOSTNAME} --csr.hosts localhost --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll orderer..."; - exit 1; - fi; - - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/ca.crt; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/signcerts/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/server.crt; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/keystore/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/server.key; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp/tlscacerts; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp/tlscacerts/tlsca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts/tlsca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}; - - echo; - echo "## Generate the admin msp"; - echo; - set -x; - fabric-ca-client enroll -u https://ordererAdmin:ordererAdminpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll ordererAdmin..."; - exit 1; - fi; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp/config.yaml;'] - restartPolicy: Never - backoffLimit: 0 ---- -{{ end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-crypto-org.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-crypto-org.yaml deleted file mode 100644 index e01bba3356..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/job-gen-crypto-org.yaml +++ /dev/null @@ -1,193 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- $jobName := printf "gen-crypto-%s-%s" $orgName $.Values.global.network.name -}} -{{- $caName := printf "ca-%s-%s" $orgName $.Values.global.network.name -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ $jobName }} -spec: - template: - spec: - volumes: - - name: volume1 - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - containers: - - name: gen-crypto-org - image: {{ printf "%s:%s" $.Values.global.images.ca.name $.Values.global.images.ca.version}} - env: - - name: DOMAIN - value: {{ $orgName }} - - name: NODE_NAME - value: {{ .name }} - - name: NODE_HOSTNAME - value: {{ $peerName }} - - name: CA_NAME - value: {{ $caName }} - - name: CA_URL - value: {{ printf "%s:7054" $caName }} - - name: CA_CERT_FILE - value: {{ printf "%s-7054-%s.pem" $caName $caName }} - - name: FABRIC_CA_CLIENT_HOME - value: {{ printf "/var/pvc1/peerOrganizations/%s" $orgName }} - - name: TLS_CACERT_PATH - value: {{ printf "/var/pvc1/fabric-ca/%s/tls-cert.pem" $orgName }} - volumeMounts: - - name: volume1 - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['echo; - res=1; - while [ $res -ne 0 ]; do - set -x; - nc -zv -w60 $CA_NAME 7054; - res=$?; - set +x; - sleep 5; - done; - echo "CA Server: $CA_NAME:7054 Up."; - sleep 5; - - echo "Enroll the CA admin"; - echo; - mkdir -p ${FABRIC_CA_CLIENT_HOME}; - - export FABRIC_CA_CLIENT_HOME=${FABRIC_CA_CLIENT_HOME}/; - - set -x; - fabric-ca-client enroll -u https://admin:adminpw@${CA_URL} --caname ${CA_NAME} --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll admin..."; - exit 1; - fi; - - echo "NodeOUs:\n Enable: true\n ClientOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: client\n PeerOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: peer\n AdminOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: admin\n OrdererOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: orderer" > ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml; - - echo; - echo "Register ${NODE_NAME}"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name ${NODE_NAME} --id.secret ${NODE_NAME}pw --id.type peer --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to register ${NODE_NAME}..."; - exit 1; - fi; - - echo; - echo "Register user"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name user1 --id.secret user1pw --id.type client --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to register user1..."; - exit 1; - fi; - - echo; - echo "Register the org admin"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name ${DOMAIN}admin --id.secret ${DOMAIN}adminpw --id.type admin --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to register ${DOMAIN}admin..."; - exit 1; - fi; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/peers; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}; - - echo; - echo "## Generate the ${NODE_NAME} msp"; - echo; - set -x; - fabric-ca-client enroll -u https://${NODE_NAME}:${NODE_NAME}pw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/msp --csr.hosts ${NODE_HOSTNAME} --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll ${NODE_NAME}..."; - exit 1; - fi; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/msp/config.yaml; - - echo; - echo "## Generate the ${NODE_NAME}-tls certificates"; - echo; - set -x; - fabric-ca-client enroll -u https://${NODE_NAME}:${NODE_NAME}pw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls --enrollment.profile tls --csr.hosts ${NODE_HOSTNAME} --csr.hosts localhost --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll ${NODE_NAME}..."; - exit 1; - fi; - - - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/ca.crt; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/signcerts/* ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/server.crt; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/keystore/* ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/server.key; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts/ca.crt; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/tlsca; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/tlsca/tlsca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/ca; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/msp/cacerts/* ${FABRIC_CA_CLIENT_HOME}/ca/ca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users/User1@${DOMAIN}; - - echo; - echo "## Generate the user msp"; - echo; - set -x; - fabric-ca-client enroll -u https://user1:user1pw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/users/User1@${DOMAIN}/msp --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll user1..."; - exit 1; - fi; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/users/User1@${DOMAIN}/msp/config.yaml; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}; - - echo; - echo "## Generate the org admin msp"; - echo; - set -x; - fabric-ca-client enroll -u https://${DOMAIN}admin:${DOMAIN}adminpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp --tls.certfiles ${TLS_CACERT_PATH}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to enroll ${DOMAIN}Admin..."; - exit 1; - fi; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp/config.yaml;'] - restartPolicy: Never - backoffLimit: 0 ---- -{{ end -}} -{{ end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/network-pvc.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/network-pvc.yaml deleted file mode 100644 index 1124829988..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/network-pvc.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ printf "%s-crypto" $.Values.global.network.name }} - labels: - app.kubernetes.io/component: "Storage" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 100Mi - storageClassName: {{ $.Values.global.network.storageClass }} - volumeMode: Filesystem ---- diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-deployment.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-deployment.yaml deleted file mode 100644 index 84a203e08f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-deployment.yaml +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- $caName := printf "ca-orderers-%s" $.Values.global.network.name -}} -{{- $dbName := printf "ca_orderers_%s" $.Values.global.network.name -}} -{{- $dbHost := printf "postgresql-%s" $.Values.global.network.name }} -{{- $dbSource := printf "host=postgresql-%s port=5432 user=%s password=%s dbname=%s sslmode=disable" $.Values.global.network.name $.Values.global.network.postgres.admin.user $.Values.global.network.postgres.admin.password $dbName -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $caName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $caName }} - template: - metadata: - labels: - name: {{ $caName }} - app: {{ $caName }} - app.kubernetes.io/component: "Orderer_CA" -{{ include "fabric-network.labels" $ | indent 8 }} - spec: - containers: - - name: {{ $caName }} - image: {{ printf "%s:%s" $.Values.global.images.ca.name $.Values.global.images.ca.version }} - command: ["sh", "-c"] - args: ['echo; - res=1; - while [ $res -ne 0 ]; do - set -x; - nc -zv -w60 {{ $dbHost }} 5432; - res=$?; - set +x; - echo "Waiting for Postgres server to be up..."; - sleep 30; - done; - echo "Postgres Server: {{ $dbHost }}:5432 Up."; - sleep 5; - fabric-ca-server start -b admin:adminpw -d;'] - ports: - - containerPort: 7054 - env: - - name: FABRIC_CA_HOME - value: /etc/hyperledger/fabric-ca-server - - name: FABRIC_CA_SERVER_CA_NAME - value: {{ $caName }} - - name: FABRIC_CA_SERVER_TLS_ENABLED - value: "true" - - name: FABRIC_CA_SERVER_PORT - value: "7054" - - name: FABRIC_CA_SERVER_CSR_CN - value: {{ $caName }} - - name: FABRIC_CA_SERVER_CSR_HOSTS - value: {{ $caName }} - - name: FABRIC_CA_SERVER_DB_TYPE - value: postgres - - name: FABRIC_CA_SERVER_DB_DATASOURCE - value: '{{ $dbSource }}' - volumeMounts: - - name: fabric-ca-volume - subPath: fabric-ca/orderer - mountPath: /etc/hyperledger/fabric-ca-server - volumes: - - name: fabric-ca-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} ---- diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-ingress.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-ingress.yaml deleted file mode 100644 index 754091546c..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-ingress.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (ne $.Values.global.cluster "OpenShift") -}} -{{- $caName := printf "ca-orderers-%s" $.Values.global.network.name -}} -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress -metadata: - name: {{ printf "%s-ingress" $caName}} - annotations: - kubernetes.io/ingress.class: "nginx" - ingress.kubernetes.io/ssl-passthrough: "true" - labels: - app.kubernetes.io/component: "CA" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - rules: - - host: {{ printf "%s.%s" $caName $.Values.global.network.domain.cluster }} - http: - paths: - - path: / - backend: - serviceName: {{ $caName }} - servicePort: grpc ---- -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-route.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-route.yaml deleted file mode 100644 index e866fd0c4b..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-route.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (eq $.Values.global.cluster "OpenShift") -}} -{{- $caName := printf "ca-orderers-%s" $.Values.global.network.name -}} -apiVersion: v1 -kind: Route -metadata: - name: {{ printf "%s-route" $caName }} - labels: - app.kubernetes.io/component: "Orderer_CA" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - host: {{ printf "%s.%s" $caName $.Values.global.network.domain.cluster }} - port: - targetPort: grpc - to: - kind: Service - name: {{ $caName }} - tls: - termination: passthrough - wildcardPolicy: None ---- -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-service.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-service.yaml deleted file mode 100644 index 8949d6632f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/templates/orderer-ca-service.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $caName := printf "ca-orderers-%s" $.Values.global.network.name -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ $caName }} - labels: - run: {{ $caName }} - app.kubernetes.io/component: "Orderer_CA" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - type: ClusterIP - selector: - name: {{ $caName }} - ports: - - protocol: TCP - port: 7054 - name: https ---- diff --git a/weaver/tests/network-setups/shared/charts/fabric-ca/values.yaml b/weaver/tests/network-setups/shared/charts/fabric-ca/values.yaml deleted file mode 100644 index 2b28f22061..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-ca/values.yaml +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.cloud9.ibm.com" - name: network1 - storageClass: nfs-storage - orderers: - - name: ord0 - profile: OneOrgOrdererGenesis - expose: true - orgList: "org1" - orgMSPList: "Org1MSP" - orgs: - - name: org1 - mspId: Org1MSP - ca: - deploy: true - expose: false - peers: - - name: peer0 - expose: true - orderer: orderer - channels: - - name: mychannel - profile: OneOrgChannel - orderer: orderer - orgs: - org1: - - peer0 - postgres: - expose: false - pvc: true - admin: - user: "pgadmin" - password: "pgadminpw" - db: "default" - storage: "500Mi" - - cluster: Kubernetes - - images: - postgres: - name: docker.io/bitnami/postgresql - version: 11.7.0-debian-10-r26 - ca: - name: hyperledger/fabric-ca - version: "1.4" - peer: - name: hyperledger/fabric-peer - version: "2.1" - orderer: - name: hyperledger/fabric-orderer - version: "2.1" - fabricTools: - name: hyperledger/fabric-tools - version: "2.1" diff --git a/weaver/tests/network-setups/shared/charts/fabric-channel/.helmignore b/weaver/tests/network-setups/shared/charts/fabric-channel/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-channel/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/fabric-channel/Chart.yaml b/weaver/tests/network-setups/shared/charts/fabric-channel/Chart.yaml deleted file mode 100644 index 1378180ae8..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-channel/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-channel -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/fabric-channel/templates/job-create-channel.yaml b/weaver/tests/network-setups/shared/charts/fabric-channel/templates/job-create-channel.yaml deleted file mode 100644 index 94577e8fb5..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-channel/templates/job-create-channel.yaml +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- $orderer := index .Values.global.network.orderers 0 -}} -{{- $ordName := printf "%s-orderers-%s" $orderer.name $.Values.global.network.name -}} -{{- $org := index .Values.global.network.orgs 0 -}} -{{- $peer := index $org.peers 0 -}} -{{- $peerName := printf "%s-%s-%s" $peer.name $org.name $.Values.global.network.name -}} -{{- range $.Values.global.network.channels }} -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ printf "create-channel-%s-%s" .name $.Values.global.network.name }} -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - containers: - - name: create-channel - image: {{ printf "%s:%s" $.Values.global.images.fabricTools.name $.Values.global.images.fabricTools.version }} - env: - - name: CHANNEL_NAME - value: {{ .name }} - - name: CORE_PEER_LOCALMSPID - value: {{ $org.mspId }} - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: {{ printf "/var/pvc1/peerOrganizations/%s/peers/%s/tls/ca.crt" $org.name $peerName }} - - name: CORE_PEER_MSPCONFIGPATH - value: {{ printf "/var/pvc1/peerOrganizations/%s/users/Admin@%s/msp" $org.name $org.name }} - - name: PEER_NAME - value: {{ $peerName }} - - name: CORE_PEER_ADDRESS - value: {{ printf "%s:7051" $peerName }} - - name: CHANNELTX - value: /var/pvc1/channel-artifacts - - name: ORDERER_NAME - value: {{ $ordName }} - - name: ORDERER_URL - value: {{ printf "%s:7050" $ordName }} - - name: ORDERER_CA - value: {{ printf "/var/pvc1/ordererOrganizations/orderer/orderers/%s/tls/ca.crt" $ordName }} - - name: CORE_PEER_TLS_ENABLED - value: "true" - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/bash", "-c"] - args: ['cd /var/pvc1; - res=1; - while [ $res -ne 0 ]; do - set -x; - nc -zv -w30 "${PEER_NAME}" 7051; - res=$?; - set +x; - sleep 5; - done; - echo "Peer: ${PEER_NAME} UP"; - res=1; - while [ $res -ne 0 ]; do - set -x; - nc -zv -w30 "${ORDERER_NAME}" 7050; - res=$?; - set +x; - sleep 5; - done; - echo "Orderer: ${ORDERER_NAME} UP"; - echo "Creating Channel: ${CHANNEL_NAME}..."; - peer channel create -o ${ORDERER_URL} -c $CHANNEL_NAME -f ${CHANNELTX}/${CHANNEL_NAME}.tx --tls --cafile ${ORDERER_CA};'] - restartPolicy: Never - backoffLimit: 4 ---- -{{ end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-channel/templates/job-join-channel.yaml b/weaver/tests/network-setups/shared/charts/fabric-channel/templates/job-join-channel.yaml deleted file mode 100644 index f74737e4b4..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-channel/templates/job-join-channel.yaml +++ /dev/null @@ -1,86 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- $orderer := index .Values.global.network.orderers 0 -}} -{{- $ordName := printf "%s-orderers-%s" $orderer.name $.Values.global.network.name -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- $orgMSP := .mspId -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -{{- range $.Values.global.network.channels }} -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ printf "%s-join-channel-%s" $peerName .name }} -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - containers: - - name: join-channel - image: {{ printf "%s:%s" $.Values.global.images.fabricTools.name $.Values.global.images.fabricTools.version }} - env: - - name: CHANNEL_NAME - value: {{ .name }} - - name: CORE_PEER_LOCALMSPID - value: {{ $orgMSP }} - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: {{ printf "/var/pvc1/peerOrganizations/%s/peers/%s/tls/ca.crt" $orgName $peerName }} - - name: CORE_PEER_MSPCONFIGPATH - value: {{ printf "/var/pvc1/peerOrganizations/%s/users/Admin@%s/msp" $orgName $orgName }} - - name: CORE_PEER_ADDRESS - value: {{ printf "%s:7051" $peerName }} - - name: PEER_NAME - value: {{ $peerName }} - - name: CHANNELTX - value: /var/pvc1/channel-artifacts - - name: ORDERER_NAME - value: {{ $ordName }} - - name: ORDERER_URL - value: {{ printf "%s:7050" $ordName }} - - name: ORDERER_CA - value: {{ printf "/var/pvc1/ordererOrganizations/orderer/orderers/%s/tls/ca.crt" $ordName }} - - name: CORE_PEER_TLS_ENABLED - value: "true" - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['cd /var/pvc1; - while [ ! -f "/var/pvc1/${CHANNEL_NAME}.block" ]; do - echo "Could not find ${CHANNEL_NAME}.block. Waiting for it to be created..."; - sleep 5; - done; - echo "${CHANNEL_NAME}.block Found."; - set -x; - peer channel join -b /var/pvc1/${CHANNEL_NAME}.block; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to join channel"; - exit 1; - fi; - set -x; - peer channel update -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} -c $CHANNEL_NAME -f ${CHANNELTX}/${CORE_PEER_LOCALMSPID}anchors.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to update anchor peers for the channel"; - exit 1; - fi; - mkdir -p /var/pvc1/channel_ready/${PEER_NAME}-${CHANNEL_NAME} - echo "Channel succesfully joined."'] - restartPolicy: Never - backoffLimit: 4 ---- -{{ end -}} -{{ end -}} -{{ end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-channel/values.yaml b/weaver/tests/network-setups/shared/charts/fabric-channel/values.yaml deleted file mode 100644 index 8d36b81aad..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-channel/values.yaml +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.cloud9.ibm.com" - name: network1 - orderers: - - name: ord0 - profile: OneOrgOrdererGenesis - expose: false - orgList: "org1" - orgMSPList: "Org1MSP" - orgs: - - name: org1 - mspId: Org1MSP - ca: - deploy: true - expose: false - peers: - - name: peer0 - expose: false - orderer: orderer - channels: - - name: mychannel - profile: OneOrgChannel - orderer: orderer - orgs: - org1: - - peer0 - postgres: - expose: false - admin: - user: "pgadmin" - password: "pgadminpw" - db: "default" - storage: "500Mi" - - cluster: Kubernetes - - images: - postgres: - name: docker.io/bitnami/postgresql - version: 11.7.0-debian-10-r26 - ca: - name: hyperledger/fabric-ca - version: "1.4" - peer: - name: hyperledger/fabric-peer - version: "2.1" - orderer: - name: hyperledger/fabric-orderer - version: "2.1" - fabricTools: - name: hyperledger/fabric-tools - version: "2.1" diff --git a/weaver/tests/network-setups/shared/charts/fabric-cli.yaml b/weaver/tests/network-setups/shared/charts/fabric-cli.yaml deleted file mode 100644 index 19357610b0..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-cli.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: fabric-cli - labels: - app.kubernetes.io/component: "fabric-cli" -spec: - replicas: 1 - selector: - matchLabels: - name: fabric-cli - template: - metadata: - labels: - name: fabric-cli - app: fabric-cli - spec: - volumes: - - name: network-volume - persistentVolumeClaim: - claimName: network1-crypto - containers: - - name: fabric-cli - image: res-dlt-interop-docker-local.artifactory.swg-devops.com/dlt-interop/interop-fabric-cli:latest - imagePullPolicy: Always - volumeMounts: - - name: network-volume - mountPath: /var/pvc1 - command: ["sh"] - args: ["-c", "sleep 6000"] - imagePullSecrets: - - name: interop-artifactory diff --git a/weaver/tests/network-setups/shared/charts/fabric-cli/.helmignore b/weaver/tests/network-setups/shared/charts/fabric-cli/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-cli/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/fabric-cli/Chart.yaml b/weaver/tests/network-setups/shared/charts/fabric-cli/Chart.yaml deleted file mode 100644 index 7755545f27..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-cli/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-cli -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/fabric-cli/templates/configmap.yaml b/weaver/tests/network-setups/shared/charts/fabric-cli/templates/configmap.yaml deleted file mode 100644 index 081ca8eb23..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-cli/templates/configmap.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $appName := printf "fabric-cli-%s" $.Values.cli.network -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $appName }}-configmap - labels: -data: - config.json: |- - { - {{- range $.Values.cli.relays }} - "{{ .network }}": { - "connProfilePath": "{{ printf "/var/pvc1/connection-profiles/ccp-%s.json" $.Values.cli.ccpOrg }}", - "relayEndpoint": "{{ .endpoint }}" - }, - {{- end }} - "_empty_": {} - } ---- diff --git a/weaver/tests/network-setups/shared/charts/fabric-cli/templates/deployment.yaml b/weaver/tests/network-setups/shared/charts/fabric-cli/templates/deployment.yaml deleted file mode 100644 index 94e798a8a9..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-cli/templates/deployment.yaml +++ /dev/null @@ -1,102 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $appName := printf "fabric-cli-%s" $.Values.cli.network -}} -{{- $volumeClaimName := printf "%s-crypto" $.Values.cli.network -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $appName }} - labels: -{{- include "fabric-cli.labels" $ | indent 4 }} - app.kubernetes.io/component: "fabric-cli" -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $appName }} - template: - metadata: - labels: - name: {{ $appName }} - app: {{ $appName }} - spec: - volumes: - - name: network-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: config-map - configMap: - name: {{ $appName }}-configmap - initContainers: - - name: init-container - image: {{ printf "%s/%s:%s" $.Values.image.repository $.Values.image.name $.Values.image.tag }} - imagePullPolicy: {{ $.Values.image.pullPolicy }} - env: - - name: NW_NAME - value: {{ $.Values.cli.network }} - - name: REMOTE_NW_ID - value: {{ $.Values.cli.remoteNetwork }} - - name: LOCAL - value: "false" - - name: DEFAULT_CHANNEL - value: {{ $.Values.cli.defaultChannel }} - - name: DEFAULT_CHAINCODE - value: {{ $.Values.cli.defaultChaincode }} - - name: MEMBER_CREDENTIAL_FOLDER - value: /var/pvc1/fabric-cli - - name: WALLET_PATH - value: /var/pvc1/wallets/fabric-cli - - name: CONFIG_PATH - value: /var/config/config.json - volumeMounts: - - name: network-volume - mountPath: /var/pvc1 - - name: config-map - mountPath: /var/config - command: ["bash", "-c"] - args: ['echo "Initialising Interop..."; - mkdir -p ${WALLET_PATH}; - mkdir -p ${MEMBER_CREDENTIAL_FOLDER}; - fabric-cli config set-file $CONFIG_PATH; - fabric-cli configure network-config --local-network=${NW_NAME}; - while [ ! -d "${MEMBER_CREDENTIAL_FOLDER}/${REMOTE_NW_ID}" ]; do - echo "Waiting for ${REMOTE_NW_ID} configuration to be loaded manually..."; - sleep 30; - done; - sleep 5; - fabric-cli configure all ${NW_NAME}; - echo "Done..";'] - containers: - - name: {{ $appName }} - image: {{ printf "%s/%s:%s" $.Values.image.repository $.Values.image.name $.Values.image.tag }} - imagePullPolicy: {{ $.Values.image.pullPolicy }} - env: - - name: NW_NAME - value: {{ $.Values.cli.network }} - - name: REMOTE_NW_ID - value: {{ $.Values.cli.remoteNetwork }} - - name: LOCAL - value: "false" - - name: DEFAULT_CHANNEL - value: {{ $.Values.cli.defaultChannel }} - - name: DEFAULT_CHAINCODE - value: {{ $.Values.cli.defaultChaincode }} - - name: MEMBER_CREDENTIAL_FOLDER - value: /var/pvc1/fabric-cli - - name: WALLET_PATH - value: /var/pvc1/wallets/fabric-cli - - name: CONFIG_PATH - value: /var/config/config.json - volumeMounts: - - name: network-volume - mountPath: /var/pvc1 - - name: config-map - mountPath: /var/config - command: ["sh"] - args: ["-c", "sleep 6000"] - imagePullSecrets: - - name: {{ $.Values.image.pullSecrets }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-cli/templates/helpers.tpl b/weaver/tests/network-setups/shared/charts/fabric-cli/templates/helpers.tpl deleted file mode 100644 index 3fea120541..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-cli/templates/helpers.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "fabric-cli.labels" }} -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-cli/values.yaml b/weaver/tests/network-setups/shared/charts/fabric-cli/values.yaml deleted file mode 100644 index e1826fd090..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-cli/values.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# Default values for fabric-cli. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -image: - repository: res-dlt-interop-docker-local.artifactory.swg-devops.com - pullPolicy: Always - pullSecrets: interop-artifactory - name: dlt-interop/interop-fabric-cli - tag: latest - -cli: - network: network1 - remoteNetwork: network2 - ccpOrg: org1 - defaultChannel: mychannel - defaultChaincode: interop - relays: - - network: network1 - endpoint: relay-network1.dlt-interop.apps.ros2.cloud9.ibm.com:30080 - - network: network2 - endpoint: relay-network2.ris3-int-dal12-ocp-9ca4d14d48413d18ce61b80811ba4308-0000.us-south.containers.appdomain.cloud:30080 diff --git a/weaver/tests/network-setups/shared/charts/fabric-network/.helmignore b/weaver/tests/network-setups/shared/charts/fabric-network/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-network/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/fabric-network/Chart.yaml b/weaver/tests/network-setups/shared/charts/fabric-network/Chart.yaml deleted file mode 100644 index c18d28e1b3..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-network/Chart.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-network -description: A Helm chart for Kubernetes -dependencies: -- name: config-maps - version: "0.1.0" - repository: file://../config-maps -- name: fabric-ca - version: "0.1.0" - repository: file://../fabric-ca -- name: fabric-nodes - version: "0.1.0" - repository: file://../fabric-nodes -- name: fabric-channel - version: "0.1.0" - repository: file://../fabric-channel -- name: deploycc - version: "0.1.0" - repository: file://../deploycc - - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/fabric-network/charts/.gitignore b/weaver/tests/network-setups/shared/charts/fabric-network/charts/.gitignore deleted file mode 100644 index aa1ec1ea06..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-network/charts/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.tgz diff --git a/weaver/tests/network-setups/shared/charts/fabric-network/values.yaml b/weaver/tests/network-setups/shared/charts/fabric-network/values.yaml deleted file mode 100644 index db74ed8663..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-network/values.yaml +++ /dev/null @@ -1,92 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.cloud9.ibm.com" - name: network1 - storageClass: nfs-storage - orderers: - - name: ord0 - profile: OneOrgOrdererGenesis - expose: false - orgList: "org1" - orgMSPList: "Org1MSP" - orgs: - - name: org1 - mspId: Org1MSP - ca: - deploy: true - expose: false - peers: - - name: peer0 - expose: false - orderer: orderer - channels: - - name: mychannel - profile: OneOrgChannel - orderer: orderer - orgs: - org1: - - peer0 - postgres: - expose: false - pvc: true - admin: - user: "pgadmin" - password: "pgadminpw" - db: "default" - storage: "500Mi" - - cluster: Kubernetes - - images: - postgres: - name: docker.io/bitnami/postgresql - version: 11.7.0-debian-10-r26 - ca: - name: hyperledger/fabric-ca - version: "1.4" - peer: - name: hyperledger/fabric-peer - version: "2.1" - orderer: - name: hyperledger/fabric-orderer - version: "2.1" - fabricTools: - name: hyperledger/fabric-tools - version: "2.1" - -deploycc: - chaincodes: - - name: fnimcc - channelName: mychannel - ordererName: ord0 - version: v1.0 - lang: golang - imageName: dlt-interop/interopcc/fnimcc - imageTag: latest - artifactoryPath: res-dlt-interop-generic-local/proof-verification/fnimcc_fabric_v2.zip - initFn: "init" - initArgs: "" - endorsementPolicy: NA - collConfig: NA - sequence: 1 - - name: snamcc - channelName: mychannel - ordererName: ord0 - version: v1.0 - lang: golang - imageName: dlt-interop/interopcc/snamcc - imageTag: latest - artifactoryPath: res-dlt-interop-generic-local/proof-generation/snamcc_fabric_v2.zip - initFn: "init" - initArgs: "\"fnimcc\"" - endorsementPolicy: NA - collConfig: NA - sequence: 1 diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/.helmignore b/weaver/tests/network-setups/shared/charts/fabric-nodes/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/Chart.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/Chart.yaml deleted file mode 100644 index 4da1743e06..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-nodes -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/NOTES.txt b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/NOTES.txt deleted file mode 100644 index e239c9fc62..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/NOTES.txt +++ /dev/null @@ -1,8 +0,0 @@ -Thank you for installaing {{ .Chart.Name }}. - -Your release is named {{ .Release.Name }}. - -To learn more about the release try: - - $ helm status {{ .Release.Name }} - $ helm get all {{ .Release.Name }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/_helpers.tpl b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/_helpers.tpl deleted file mode 100644 index 4835e8fd07..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/_helpers.tpl +++ /dev/null @@ -1,6 +0,0 @@ -{{- define "fabric-network.labels" }} -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-deployment.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-deployment.yaml deleted file mode 100644 index cf0526160b..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-deployment.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- $configMapName := printf "%s-configtx" $.Values.global.network.name -}} -{{- range $.Values.global.network.orderers }} -{{- $ordName := printf "%s-orderers-%s" .name $.Values.global.network.name -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $ordName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $ordName }} - template: - metadata: - labels: - name: {{ $ordName }} - app: {{ $ordName }} - app.kubernetes.io/component: "Orderer" -{{ include "fabric-network.labels" $ | indent 8 }} - spec: - containers: - - name: {{ $ordName }} - image: {{ printf "%s:%s" $.Values.global.images.orderer.name $.Values.global.images.orderer.version }} - command: ["sh", "-c", "orderer"] - ports: - - containerPort: 7050 - env: - - name: FABRIC_LOGGING_SPEC - value: INFO - - name: FABRIC_CFG_PATH - value: /etc/hyperledger/fabric - - name: ORDERER_GENERAL_LISTENADDRESS - value: 0.0.0.0 - - name: ORDERER_GENERAL_LISTENPORT - value: "7050" - - name: ORDERER_GENERAL_GENESISMETHOD - value: file - - name: ORDERER_GENERAL_GENESISFILE - value: /fabric/system-genesis-block/genesis.block - - name: ORDERER_GENERAL_LOCALMSPID - value: OrdererMSP - - name: ORDERER_GENERAL_LOCALMSPDIR - value: /fabric/orderer/msp - - name: ORDERER_GENERAL_TLS_ENABLED - value: "true" - - name: ORDERER_GENERAL_TLS_PRIVATEKEY - value: /fabric/orderer/tls/server.key - - name: ORDERER_GENERAL_TLS_CERTIFICATE - value: /fabric/orderer/tls/server.crt - - name: ORDERER_GENERAL_TLS_ROOTCAS - value: /fabric/orderer/tls/ca.crt - - name: ORDERER_KAFKA_TOPIC_REPLICATIONFACTOR - value: "1" - - name: ORDERER_KAFKA_VERBOSE - value: "true" - - name: ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE - value: /fabric/orderer/tls/server.crt - - name: ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY - value: /fabric/orderer/tls/server.key - - name: ORDERER_GENERAL_CLUSTER_ROOTCAS - value: /fabric/orderer/tls/ca.crt - volumeMounts: - - name: orderer-volume - subPath: {{ printf "ordererOrganizations/orderer/orderers/%s" $ordName }} - mountPath: /fabric/orderer - - name: orderer-volume - subPath: system-genesis-block - mountPath: /fabric/system-genesis-block - initContainers: - - name: gen-genesis-block - image: {{ printf "%s:%s" $.Values.global.images.fabricTools.name $.Values.global.images.fabricTools.version }} - env: - - name: ORDERER_PROFILE - value: {{ .profile }} - - name: FABRIC_CFG_PATH - value: /var/pvc1 - volumeMounts: - - name: orderer-volume - mountPath: /var/pvc1 - - name: configtx - mountPath: /var/fabric_cfg - command: ["/bin/sh", "-c"] - args: ['if [ ! -f /var/pvc1/system-genesis-block/genesis.block ]; then - mkdir -p /var/pvc1/system-genesis-block; - cp /var/fabric_cfg/configtx.yaml /var/pvc1/; - - set -x; - configtxgen -profile ${ORDERER_PROFILE} -channelID system-channel -outputBlock /var/pvc1/system-genesis-block/genesis.block; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to generate orderer genesis block..."; - exit 1; - fi; - fi;'] - volumes: - - name: orderer-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: configtx - configMap: - name: {{ $configMapName }} ---- -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-ingress.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-ingress.yaml deleted file mode 100644 index 502678e91b..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-ingress.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (ne $.Values.global.cluster "OpenShift") -}} -{{- range $.Values.global.network.orderers }} -{{- $ordName := printf "%s-orderers-%s" .name $.Values.global.network.name -}} -{{- if .expose -}} -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress -metadata: - name: {{ printf "%s-ingress" $ordName }} - annotations: - nginx.ingress.kubernetes.io/ssl-passthrough: "true" - kubernetes.io/ingress-class: "nginx" - labels: - app.kubernetes.io/component: "Orderer" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - rules: - - host: {{ printf "%s.%s" $ordName $.Values.global.network.domain.cluster }} - http: - paths: - - path: / - backend: - serviceName: {{ $ordName }} - servicePort: grpc ---- -{{- end -}} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-route.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-route.yaml deleted file mode 100644 index 65711cd923..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-route.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (eq $.Values.global.cluster "OpenShift") -}} -{{- range $.Values.global.network.orderers }} -{{- $ordName := printf "%s-orderers-%s" .name $.Values.global.network.name -}} -{{- if .expose -}} -apiVersion: v1 -kind: Route -metadata: - name: {{ printf "%s-route" $ordName }} - labels: - app.kubernetes.io/component: "Orderer CA" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - host: {{ printf "%s.%s" $ordName $.Values.global.network.domain.cluster }} - port: - targetPort: grpc - to: - kind: Service - name: {{ $ordName }} - tls: - termination: passthrough - wildcardPolicy: None ---- -{{- end -}} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-service.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-service.yaml deleted file mode 100644 index e39d9b6b7d..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/orderer-service.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- range $.Values.global.network.orderers }} -{{- $ordName := printf "%s-orderers-%s" .name $.Values.global.network.name -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ $ordName }} - labels: - run: {{ $ordName }} - app.kubernetes.io/component: "Orderer" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - type: ClusterIP - selector: - name: {{ $ordName }} - ports: - - protocol: TCP - port: 7050 - name: grpc ---- -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-deployment.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-deployment.yaml deleted file mode 100644 index e58ed15e5b..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-deployment.yaml +++ /dev/null @@ -1,113 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.global.network.name -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- $orgMSP := .mspId -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $peerName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $peerName }} - template: - metadata: - labels: - name: {{ $peerName }} - app: {{ $peerName }} - app.kubernetes.io/component: "Peer" -{{ include "fabric-network.labels" $ | indent 8 }} - spec: - containers: - - name: peers - image: {{ printf "%s:%s" $.Values.global.images.peer.name $.Values.global.images.peer.version }} - command: ["sh", "-c", "apk add --no-cache bash jq; - peer node start"] - ports: - - containerPort: 7051 - - containerPort: 7052 - - containerPort: 7053 - env: - - name: FABRIC_LOGGING_SPEC - value: INFO - - name: FABRIC_CFG_PATH - value: /etc/hyperledger/fabric - - name: CORE_PEER_ID - value: {{ $peerName }} - - name: CORE_PEER_ADDRESS - value: {{ printf "%s:7051" $peerName }} - - name: CORE_PEER_LISTENADDRESS - value: 0.0.0.0:7051 - - name: CORE_PEER_CHAINCODEADDRESS - value: {{ printf "%s:7052" $peerName }} - - name: CORE_PEER_CHAINCODELISTENADDRESS - value: 0.0.0.0:7052 - - name: CORE_PEER_GOSSIP_BOOTSTRAP - value: {{ printf "%s:7051" $peerName }} - - name: CORE_PEER_GOSSIP_ENDPOINT - value: {{ printf "%s:7051" $peerName }} - - name: CORE_PEER_GOSSIP_EXTERNALENDPOINT - value: {{ printf "%s:7051" $peerName }} - - name: CORE_PEER_GOSSIP_ORGLEADER - value: "false" - - name: CORE_PEER_GOSSIP_USELEADERELECTION - value: "true" - - name: CORE_PEER_PROFILE_ENABLED - value: "true" - - name: CORE_PEER_LOCALMSPID - value: {{ $orgMSP }} - - name: CORE_PEER_MSPCONFIGPATH - value: /fabric/peer/msp - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: CORE_PEER_PROFILE_ENABLED - value: "true" - - name: CORE_PEER_TLS_KEY_FILE - value: /fabric/peer/tls/server.key - - name: CORE_PEER_TLS_CERT_FILE - value: /fabric/peer/tls/server.crt - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: /fabric/peer/tls/ca.crt - - name: CORE_LEDGER_STATE_DATABASE - value: "CouchDB" - - name: CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS - value: "localhost:5984" - - name: ORDERER_URL - value: {{ printf "%s-orderers-%s:7050" .orderer $.Values.global.network.name }} - volumeMounts: - - name: peer-volume - subPath: {{ printf "peerOrganizations/%s/peers/%s" $orgName $peerName }} - mountPath: /fabric/peer - - name: peer-volume - mountPath: /fabric/network1-secrets - - name: peer-config - mountPath: /etc/hyperledger/fabric - - name: external-builder - mountPath: /fabric/external-service-builder/bin - - name: couchdb - image: hyperledger/fabric-couchdb - ports: - - containerPort: 5984 - volumes: - - name: peer-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: peer-config - configMap: - name: peer-config - - name: external-builder - configMap: - name: external-builder - defaultMode: 0777 ---- -{{- end }} -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-ingress.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-ingress.yaml deleted file mode 100644 index 78ef4bb3fa..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-ingress.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (ne $.Values.global.cluster "OpenShift") -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress -metadata: - name: {{ printf "%s-ingress" $peerName }} - annotations: - nginx.ingress.kubernetes.io/ssl-passthrough: "true" - kubernetes.io/ingress-class: "nginx" - labels: - app.kubernetes.io/component: "Orderer" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - rules: - - host: {{ printf "%s.%s" $peerName $.Values.global.network.domain.cluster }} - http: - paths: - - path: / - backend: - serviceName: {{ $peerName }} - servicePort: grpc ---- -{{- end }} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-route.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-route.yaml deleted file mode 100644 index b3d0478c21..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-route.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if (eq $.Values.global.cluster "OpenShift") -}} -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- range .peers }} -{{- if .expose -}} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -apiVersion: v1 -kind: Route -metadata: - name: {{ printf "%s-route" $peerName }} - labels: - app.kubernetes.io/component: "Peer" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - host: {{ printf "%s.%s" $peerName $.Values.global.network.domain.cluster }} - port: - targetPort: grpc - to: - kind: Service - name: {{ $peerName }} - tls: - termination: passthrough - wildcardPolicy: None ---- -{{- end -}} -{{- end }} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-service.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-service.yaml deleted file mode 100644 index 9a55759e4b..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/templates/peer-service.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- range $.Values.global.network.orgs }} -{{- $orgName := .name -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.global.network.name -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ $peerName }} - labels: - run: {{ $peerName }} - app.kubernetes.io/component: "Peer" -{{ include "fabric-network.labels" $ | indent 4 }} -spec: - type: ClusterIP - selector: - name: {{ $peerName }} - ports: - - protocol: TCP - port: 7051 - name: grpc - - protocol: TCP - port: 7053 - name: events - - protocol: TCP - port: 5984 - name: couchdb ---- -{{- end }} -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/fabric-nodes/values.yaml b/weaver/tests/network-setups/shared/charts/fabric-nodes/values.yaml deleted file mode 100644 index 8d36b81aad..0000000000 --- a/weaver/tests/network-setups/shared/charts/fabric-nodes/values.yaml +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.cloud9.ibm.com" - name: network1 - orderers: - - name: ord0 - profile: OneOrgOrdererGenesis - expose: false - orgList: "org1" - orgMSPList: "Org1MSP" - orgs: - - name: org1 - mspId: Org1MSP - ca: - deploy: true - expose: false - peers: - - name: peer0 - expose: false - orderer: orderer - channels: - - name: mychannel - profile: OneOrgChannel - orderer: orderer - orgs: - org1: - - peer0 - postgres: - expose: false - admin: - user: "pgadmin" - password: "pgadminpw" - db: "default" - storage: "500Mi" - - cluster: Kubernetes - - images: - postgres: - name: docker.io/bitnami/postgresql - version: 11.7.0-debian-10-r26 - ca: - name: hyperledger/fabric-ca - version: "1.4" - peer: - name: hyperledger/fabric-peer - version: "2.1" - orderer: - name: hyperledger/fabric-orderer - version: "2.1" - fabricTools: - name: hyperledger/fabric-tools - version: "2.1" diff --git a/weaver/tests/network-setups/shared/charts/relay-one/Chart.yaml b/weaver/tests/network-setups/shared/charts/relay-one/Chart.yaml deleted file mode 100644 index 2279f072f6..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/Chart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: Relay-one -description: A Helm chart for deploying a Relay Server - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1.0 diff --git a/weaver/tests/network-setups/shared/charts/relay-one/README.md b/weaver/tests/network-setups/shared/charts/relay-one/README.md deleted file mode 100644 index 62b9c47f97..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/README.md +++ /dev/null @@ -1,68 +0,0 @@ - -# Relay Server Helm Chart - -This Helm chart deploys an instance of a Relay Server and allows for customising the deployment of the relay via the default image built via the relay repository (suggested image is: `dlt-interop/relay-server`). - -## Basic Configuration - -The relay can be configured by specifying all of its required settings via the [values.yaml](values.yaml) file. The following aspects can be configured: - -- Relay server name (i.e. `server.name`) -- Relay server host (i.e. `server.host`): this will be used to create the associated service name. -- Relay server port (i.e. `server.port`): this will be used to create the associated service port. -- Driver name: (i.e. `discovery.driver.name`) -- Driver host: (i.e. `discovery.driver.host`): this should be set to the hostname/service name of the driver. -- Driver port: (i.e. `discovery.driver.port`): this should be set to the port of the driver (use the service port if deploying in K8s cluster) -- Additional configuration for remote relays. - -### Deployment details - -The following section of the configuration contains the details of the deployment in the cluster: - -```yaml - -deployment: - image: dlt-interop/relay-server:latest - imagePullPolicy: Always - replicas: 1 - namespace: default -``` - - -## Customising the Default Configuration - -The relay image allows for configuring more deeply the relay server by specifying the confguration files, -template server configuration, and root path forn the DNS configuration of the remote relay. These settings are available via the following configuration entries: - -- `configuration.path` : for the server configuration file, for supplying a specific confiuguration. -- `configuration.templatePath` : for specifying a given server template. -- `configuration.relaysPath` : for specifying a different root path for the relay entries. - -__NOTE__: This chart does not provides any functionality to create and specify the content of these files. These files at present time are expected to be already available via the image used for the deployment of the server. - -## Customising the Relays discovery - -This charts allows for specifying the details about the remote relays that this server should know about. This is done by adding entries in the following configuration settings: - -```yaml -discovery: - relays: - dns: - - group: fabric - entries: - - name: Relay Network 1 - host: relay.network1.dlt-interop.org - port: 9080 - - name: Relay Network 2 - host: relay.network2.dlt-interop.org - port: 9081 - - group: corda - entries: - ..... -``` - -This configuration creates a config map with two file entries (i.e. `fabric.toml` and `corda.toml`) containing the specification of the relays to be added to the server configuration file. The config map is mounted as a volume to the relay server deployment under the path identified by `configuration.relaysPath` or `/opt/relay/config/relays` if not specified. The startup script will do the rest to inject the relays configuration into the server configuration file. diff --git a/weaver/tests/network-setups/shared/charts/relay-one/templates/NOTES.txt b/weaver/tests/network-setups/shared/charts/relay-one/templates/NOTES.txt deleted file mode 100644 index b02bcd7746..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/templates/NOTES.txt +++ /dev/null @@ -1,14 +0,0 @@ -Thank you for installaing {{ .Chart.Name }}. - -The relay server has been deployed as follows: - - Name: {{ .Values.relay.name }} - Host: {{ .Values.relay.name }}-{{ .Values.network.name }} - Port: {{ .Values.relay.port }} - -Your release is named {{ .Release.Name }}. - -To learn more about the release try: - - $ helm status {{ .Release.Name }} - $ helm get all {{ .Release.Name }} diff --git a/weaver/tests/network-setups/shared/charts/relay-one/templates/_helpers.tpl b/weaver/tests/network-setups/shared/charts/relay-one/templates/_helpers.tpl deleted file mode 100644 index 74ff0f242f..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/templates/_helpers.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{- define "relay-server.labels" -}} -relay.dlt-interop.org/role: "relay-server" -relay.dlt-interop.org/network: "{{ $.Values.network.name }}" -relay.dlt-interop.org/name: "{{ $.Values.driver.name }}" -app.kubernetes.io/component: "Relay-Server" -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/relay-one/templates/driver-configmap.yaml b/weaver/tests/network-setups/shared/charts/relay-one/templates/driver-configmap.yaml deleted file mode 100644 index d69bfb8e7b..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/templates/driver-configmap.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.driver.configmap -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $.Values.driver.name }}-{{ $.Values.network.name }}-configmap - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: -{{ include "relay-server.labels" $ | indent 4 }} -data: - config.json: |- - { - "admin":{ - "name":"admin", - "secret":"adminpw" - }, - "relay": { - "name":"relay", - "affiliation":"{{ $.Values.driver.affiliation }}", - "role": "client", - "attrs": [{ "name": "relay", "value": "true", "ecert": true }] - }, - "mspId": "{{ $.Values.driver.mspId }}", - "caUrl": "" - } - -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-deployment.yaml b/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-deployment.yaml deleted file mode 100644 index 41210d741d..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-deployment.yaml +++ /dev/null @@ -1,188 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-crypto" $.Values.network.name -}} -{{- $relayName := printf "%s-%s" $.Values.relay.name $.Values.network.name -}} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $relayName }} - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: -{{ include "relay-server.labels" $ | indent 4}} -spec: - replicas: {{ $.Values.deployment.replicas | default 1 }} - selector: - matchLabels: - name: {{ $relayName }} - template: - metadata: - labels: - name: {{ $relayName }} - app: {{ $relayName }} -{{ include "relay-server.labels" $ | indent 8 }} - spec: - volumes: - {{- if eq $.Values.network.type "Fabric" }} - - name: network-volume - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: generate-ccp - configMap: - name: generate-ccp - {{- end }} - {{- if $.Values.driver.configmap }} - - name: driver-config - configMap: - name: {{ $.Values.driver.name }}-{{ $.Values.network.name }}-configmap - {{- end }} - {{- if $.Values.relay.discovery.relays.dns }} - - name: remote-dns - configMap: - name: {{ $relayName }}-configmap - {{- end }} - {{- if eq $.Values.network.type "Fabric" }} - initContainers: - - name: generate-ccp - image: alpine:3.7 - env: - - name: ORG - value: {{ $.Values.driver.org }} - - name: ORGMSP - value: {{ $.Values.driver.mspId }} - - name: P0PORT - value: "7051" - - name: CAPORT - value: "7054" - - name: NW - value: {{ $.Values.network.name }} - - name: PEERPEM - value: {{ printf "/var/pvc1/peerOrganizations/%s/tlsca/tlsca.%s-cert.pem" $.Values.driver.org $.Values.driver.org }} - - name: CAPEM - value: {{ printf "/var/pvc1/fabric-ca/%s/tls-cert.pem" $.Values.driver.org }} - - name: CCP_TEMPLATE - value: /var/ccp/ccp-template.json - - name: CCPPATH - value: {{ printf "/var/pvc1/connection-profiles/ccp-%s.json" $.Values.driver.org }} - volumeMounts: - - name: network-volume - mountPath: /var/pvc1 - - name: generate-ccp - mountPath: /var/ccp - command: ["/bin/sh", "-c"] - args: ['mkdir -p /var/pvc1/connection-profiles; - mkdir -p /var/pvc1/wallets/relay; - apk update; - apk add bash; - bash /var/ccp/ccp-generate.sh'] - {{- end }} - containers: - - name: {{ $relayName }} - image: {{ printf "%s/%s" $.Values.deployment.imageRegistry $.Values.deployment.relayImage }} - {{- if $.Values.deployment.imagePullPolicy }} - imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }} - {{- end }} - ports: - - containerPort: {{ $.Values.relay.port }} - env: - - name: RELAY_NAME - value: {{ $relayName }} - - name: RELAY_PORT - value: "{{ $.Values.relay.port }}" - - name: NETWORK_TYPE - value: {{ $.Values.network.type }} - {{- if $.Values.network.name }} - - name: NETWORK_NAME - value: {{ $.Values.network.name }} - {{- end }} - {{- if $.Values.relay.configuration }} - {{- if $.Values.relay.configuration.templatePath }} - - name: RELAY_CONFIG_TEMPLATE - value: {{ $.Values.relay.configuration.templatePath }} - {{- end }} - {{- if $.Values.relay.configuration.path }} - - name: RELAY_CONFIG - value: {{ $.Values.relay.configuration.path }} - {{- end }} - - name: RELAY_DNS_CONFIG - value: /opt/relay/config/relays - {{- end }} - {{- if $.Values.relay.discovery.driver }} - - name: DRIVER_NAME - value: {{ $.Values.relay.discovery.driver.name }} - - name: DRIVER_HOST - value: {{ $.Values.relay.discovery.driver.host }} - - name: DRIVER_PORT - value: "{{ $.Values.relay.discovery.driver.port }}" - {{- end }} - {{- range $.Values.relay.environment }} - - name: {{ .name }} - - value: {{ .value }} - {{- end }} - {{- if $.Values.relay.discovery.relays.dns }} - volumeMounts: - - name: remote-dns - mountPath: /opt/relay/config/relays - {{- end }} - {{- if eq $.Values.network.type "Fabric" }} - - name: {{ $.Values.driver.name }} - image: {{ printf "%s/%s" $.Values.deployment.imageRegistry $.Values.deployment.fabricDriverImage }} - {{- if $.Values.deployment.imagePullPolicy }} - imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }} - {{- end }} - ports: - - containerPort: {{ $.Values.driver.port }} - command: ["sh"] - args: ["-c", "npm run dev"] - env: - - name: CRYPTO_ROOT - value: /fabric-driver/crypto-config - - name: NETWORK_NAME - value: {{ $.Values.network.name }} - - name: RELAY_ENDPOINT - value: {{ printf "localhost:%s" $.Values.relay.port }} - - name: DRIVER_ENDPOINT - value: {{ printf "0.0.0.0:%s" $.Values.driver.port }} - - name: CONNECTION_PROFILE - value: {{ printf "/fabric-driver/connection-profiles/ccp-%s.json" $.Values.driver.org }} - - name: CONFIG_FILE - value: /fabric-driver/config/config.json - - name: local - value: "false" - imagePullPolicy: Always - volumeMounts: - - name: network-volume - subPath: connection-profiles - mountPath: /fabric-driver/connection-profiles/ - - name: network-volume - subPath: wallets/relay - mountPath: {{ printf "/fabric-driver/wallet-%s" $.Values.network.name }} - {{- if $.Values.driver.configmap }} - - name: driver-config - mountPath: /fabric-driver/config/ - {{- end }} - {{- else if eq $.Values.network.type "Corda" }} - - name: {{ $.Values.driver.name }} - image: {{ printf "%s/%s" $.Values.deployment.imageRegistry $.Values.deployment.cordaDriverImage }} - {{- if $.Values.deployment.imagePullPolicy }} - imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }} - {{- end }} - env: - - name: DRIVER_PORT - value: "{{ $.Values.driver.port }}" - command: ["sh"] - args: ["-c", "./bin/corda-driver"] - ports: - - containerPort: {{ $.Values.driver.port }} - {{- if $.Values.driver.configmap }} - volumeMounts: - - name: driver-config - mountPath: /corda-driver/config/ - {{- end }} - {{- end }} - imagePullSecrets: - - name: {{ $.Values.deployment.imagePullSecrets }} ---- diff --git a/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-ingress.yaml b/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-ingress.yaml deleted file mode 100644 index 9953e3c562..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-ingress.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.relay.expose }} -{{- $relayName := printf "%s-%s" $.Values.relay.name $.Values.network.name -}} -apiVersion: networking.k8s.io/v1beta1 -kind: Ingress -metadata: - name: {{ printf "%s-ingress" $relayName }} - namespace: {{ $.Values.deployment.namespace | default "default" }} - annotations: - kubernetes.io/ingress.class: "nginx" - ingress.kubernetes.io/ssl-passthrough: "true" - labels: -{{ include "relay-server.labels" $ | indent 4}} -spec: - rules: - - host: {{ printf "%s-%s.%s" $relayName $.Values.deployment.namespace $.Values.network.domain.cluster }} - http: - paths: - - path: / - backend: - serviceName: {{ $relayName }} - servicePort: grpc ---- -{{- end }} diff --git a/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-service.yaml b/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-service.yaml deleted file mode 100644 index a93d95fcee..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/templates/relay-service.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $relayName := printf "%s-%s" $.Values.relay.name $.Values.network.name -}} -apiVersion: v1 -kind: Service -metadata: - name: {{ $relayName }} - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: - app.kubernetes.io/component: "Relay" -{{ include "relay-server.labels" $ | indent 4 }} -spec: - type: NodePort - selector: - name: {{ $relayName }} - ports: - - protocol: TCP - port: {{ $.Values.relay.port }} - targetPort: {{ $.Values.relay.port }} - nodePort: {{ $.Values.relay.nodeport }} - name: grpc diff --git a/weaver/tests/network-setups/shared/charts/relay-one/templates/server-configmap.yaml b/weaver/tests/network-setups/shared/charts/relay-one/templates/server-configmap.yaml deleted file mode 100644 index 4a23df7f89..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/templates/server-configmap.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.relay.discovery.relays.dns -}} -{{- $relayName := printf "%s-%s" $.Values.relay.name $.Values.network.name -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $relayName }}-configmap - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: -{{ include "relay-server.labels" $ | indent 4 }} -data: -{{- range $.Values.relay.discovery.relays.dns }} - {{ .group }}.toml: |- - {{- range .entries }} - [relays.{{.name}}] - hostname={{ quote .host }} - port={{ quote .port }} - - - {{- end }} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/relay-one/values.yaml b/weaver/tests/network-setups/shared/charts/relay-one/values.yaml deleted file mode 100644 index 1c934898fe..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay-one/values.yaml +++ /dev/null @@ -1,140 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# This section provides information about the network that is being -# proxied by the relay. At present time we only require to know the -# network name. -# -# NOTE: this setting WILL ONLY take effect if a server configuration -# is not supplied to the relay. Otherwise, they will be overridden -# by the values in the actual configuration file. -# -network: - name: network1 - type: Fabric - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "apps.ros2.cloud9.ibm.com" - -driver: - name: fabric-driver - port: "9090" - org: org1 - affiliation: org1.department1 - mspId: Org1MSP - configmap: true - -# This section provides information about the server. More specifically -# the name of the relay, its hostname, which is of use to create the -# service name and the port the relay is going to listen to. -# -# NOTE: this setting WILL ONLY take effect if there is no server configuration -# supplied to the container. In that case corresponding values stored -# in the configuration file will override these settings. -# -# In the specific case where a concrete configuration is supplied the -# the values for the host and the port MUST match the values entered -# here, because these values are used to create the service instance -# that exposes the relay deployment. -# - -relay: - name: relay - port: "9080" - nodeport: "30080" - expose: false - - # This section provides a way to customise the relay server with - # additional environment variables that can be used to specialise - # the server configuration file if a specific file is used. - environment: {} - # Uncomment this entry if you want to enable the debug mode of the - # relay. This is also an example of how to add additional parameters - # that you would like to use to configure the relay. - # - # NOTE: If these are variable referenced in the server configuration - # template file they will only take effect if a server configuration - # is not supplied. - # - # - name: DEBUG - # value: "true" - - # This section determines how the relay get to discover all the - # other components required for its operation. At present time - # these are the associated driver and the remote relays. - # - discovery: - # This section specifies the details of the associated driver the server - # is going to work with. We need the information about the name, host, - # and port of the driver. These details are exposed through environment - # variables and then injected in the relay configuration, via specialisation - # of the server configuration template. - # - # NOTE: these settings WILL NOT TAKE EFFECT if a specific configuration file - # is being supplied. - driver: - name: fabric-driver - host: localhost - port: "9090" - # This section specifies the relay entries that are known to the relay server. - # These are currently added to the configuration file of the server, by creating - # a file that is named dns[..].group under the path specified by configuration.relaysPath. - relays: - # This property specifies a local set of DNS entries that are added to the - # relay server configuration file. In ther future other modes may be used. - # The system allows for allowing multiple DNS sets to be added to the - # configuration server which can be added as distinct files. The name of the - # name of the group determines the name of the file that is being created. - dns: - # This is the default group, which will generate a default.toml file, with - # a relay entry for each item in the entries array. - - group: default - entries: - - name: relay-network1 - host: relay-network1.dlt-interop.apps.ros2.sl.cloud9.ibm.com - port: "30080" - - name: relay-network2 - host: relay-network2.ris3-int-dal12-ocp-9ca4d14d48413d18ce61b80811ba4308-0000.us-south.containers.appdomain.cloud - port: "30080" - - # This section provides information about the configuration settings - # that are used to control the overall behaviour of the relay. We - # configure here the location of server configuration file and the - # configuration template file. - # - configuration: - # This is the path to the file that represents the server configuration. - # The assigned value is the default value and does not need to be specified. - # If this file exists it will be used as it is in combination with the - # various remote relays that are provided in the discovery section. - path: /opt/relay/config/server.toml - # This is the path to the server configuration file template. The default - # value for the environment variable is shown. This file is used to generate - # the configuration at runtime based on the environment variables supplied - # to the relay server and it is only used if a specific configuration file - # is not used. - # - templatePath: /opt/relay/config/server.template.toml - # This is the path to the directory that stores all the configuration about - # the various relays that are known to the relay server. By default all the - # file with .toml extensions will be loaded in and added to the server - # configuration file. - # - relaysPath: /opt/relay/config/relays - - -# Additional information about the deployment of the server -# such as the image being used, the number of replicas and -# the target namespace. -deployment: - relayImage: dlt-interop/relay-server:latest - fabricDriverImage: dlt-interop/fabric-driver:latest - cordaDriverImage: dlt-interop/corda-driver:latest - imagePullPolicy: Always - namespace: dlt-interop - replicas: 1 - imageRegistry: res-dlt-interop-docker-local.artifactory.swg-devops.com - imagePullSecrets: interop-artifactory diff --git a/weaver/tests/network-setups/shared/charts/relay/.helmignore b/weaver/tests/network-setups/shared/charts/relay/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/shared/charts/relay/Chart.yaml b/weaver/tests/network-setups/shared/charts/relay/Chart.yaml deleted file mode 100644 index 8860f0762c..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/Chart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-network -description: A Helm chart for deploying a Relay - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1.0 \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/relay/README.md b/weaver/tests/network-setups/shared/charts/relay/README.md deleted file mode 100644 index fa7e6ed4b9..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/README.md +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/Chart.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/Chart.yaml deleted file mode 100644 index 985efc8ad7..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/Chart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-network -description: A Helm chart for deploying a Relay Dummy Driver - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1.0 \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/README.md b/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/README.md deleted file mode 100644 index be28492c11..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/README.md +++ /dev/null @@ -1,56 +0,0 @@ - -# Relay Dummy Driver Helm Chart - -This Helm chart deploys an instance of Dumy Driver for testing purposes and allows for customising the deployment via the default image built via the relay repository (suggested image is: `dlt-interop/relay-driver`). - -## Basic Configuration - -The relay can be configured by specifying all of its required settings via the [values.yaml](values.yaml) file. The following aspects can be configured: - -- Driver name (i.e. `driver.name`) -- Driver host (i.e. `driver.host`): this will be used to create the associated service name. -- Driver port (i.e. `driver.port`): this will be used to create the associated service port. -- Relay Server name: (i.e. `discovery.relay.name`) -- Realy Server host: (i.e. `discovery.relay.host`): this should be set to the hostname/service name of the relay server. -- Relay Server port: (i.e. `discovery.relay.port`): this should be set to the port of the relay server (use the service port if deploying in K8s cluster) - -### Deployment details - -The following section of the configuration contains the details of the deployment in the cluster: - -```yaml - -deployment: - image: dlt-interop/relay-driver:latest - imagePullPolicy: Always - replicas: 1 - namespace: default -``` - - -## Customising the Default Configuration - -The driver image allows for configuring more deeply the driver by specifying the confguration files, and template server configuration. These settings are available via the following configuration entries: - -- `configuration.path` : for the driver configuration file, for supplying a specific confiuguration. -- `configuration.templatePath` : for specifying a given driver configuration template. - -__NOTE__: This chart does not provides any functionality to create and specify the content of these files. These files at present time are expected to be already available via the image used for the deployment of the server. - -## Relay Server Discovery - -The details of the server where to connect are specified in the discover section: - -```yaml -discovery: - relay: - name: Relay Server - host: relay-server - port: 9080 -``` - -The above shows the default configuration for the dummy relay. The value of the `host` property must be set to the service name exposing the relay server in the K8s cluster, or the full service name if deployed in another namespace. \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/NOTES.txt b/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/NOTES.txt deleted file mode 100644 index bd10c9e5b3..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/NOTES.txt +++ /dev/null @@ -1,15 +0,0 @@ -Thank you for installaing {{ .Chart.Name }}. - -The relay server has been deployed as follows: - - Name: {{ .Values.driver.name }} - Host: {{ .Values.driver.host }} - Port: {{ .Values.driver.port }} - -Your release is named {{ .Release.Name }}. - -To learn more about the release try: - - $ helm status {{ .Release.Name }} - $ helm get all {{ .Release.Name }} - diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/_helpers.tpl b/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/_helpers.tpl deleted file mode 100644 index cd5c42bd42..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/_helpers.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{- define "relay-dummy-driver.labels" }} -relay.dlt-interop.org/role: "relay-dummy-driver" -relay.dlt-interop.org/network: "{{ $.Values.network.name }}" -relay.dlt-interop.org/name: "{{ $.Values.driver.name }}" -app.kubernetes.io/component: "Relay Dummy Driver" -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/dummy-driver-deployment.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/dummy-driver-deployment.yaml deleted file mode 100644 index 07623d425a..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/dummy-driver-deployment.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Deployment -metadata: - name: {{ $.Values.driver.name | default "Relay Dummy Driver" }} - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: -{{ include "relay-dummy-driver.labels" | indent 4 }} -spec: - replicas: {{ $.Values.deployment.replicas | default 1 }} - selector: - matchLabels: - name: {{ $.Values.driver.name }} - template: - metadata: - labels: - name: {{ $.Values.driver.name }} - app: {{ $.Values.driver.name }} -{{ include "relay-dummy-driver.labels" $ | indent 8 }} - spec: - containers: - - name: {{ $.Values.driver.name }} - image: {{ $.Values.deployment.image }} - {{- if $.Values.deployment.imagePullPolicy -}} - imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }} - {{- end -}} - ports: - - containerPort: {{ $.Values.driver.port }} - env: - {{- if $.Values.network.name -}} - - name: NETWORK_NAME - value: {{ $.Value.network.name -}} - {{- end -}} - {{- if $.Values.configuration -}} - {{- if $.Values.configuration.templatePath -}} - - name: DRIVER_CONFIG_TEMPLATE - value: {{ $.Values.configuration.templatePath }} - {{- end -}} - {{- if $.Values.configuration.path -}} - - name: DRIVER_CONFIG - value: {{ $.Values.configuration.templatePath }} - {{- end -}} - {{- end -}} - {{- if $.Values.discovery.driver -}} - - name: RELAY_NAME - value: {{ #.Values.discovery.driver.name }} - - name: RELAY_HOST - value: {{ #.Values.discovery.driver.host }} - - name: RELAY_PORT - value: {{ #.Values.discovery.driver.port }} - {{- end -}} - {{- range $.Values.environment }} - - name: {{ .name }} - value: {{ .value }} - {{- end }} diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/dummy-driver-service.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/dummy-driver-service.yaml deleted file mode 100644 index f5703ed081..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/templates/dummy-driver-service.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Service -metadata: - name: {{ $.Values.driver.host }} - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: - relay/dlt-interop.org/name: {{ $.Values.driver.name }} - app.kubernetes.io/component: "Relay Dummy Driver" -{{ include "relay-dummy-driver.labels" $ | indent 4 }} -spec: - type: ClusterIP - selector: - name: {{ $.Values.driver.name }} - ports: - - protocol: TCP - port: {{ $.Values.driver.port }} - name: grpc diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/values.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/values.yaml deleted file mode 100644 index c25c9a6d14..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-dummy-driver/values.yaml +++ /dev/null @@ -1,97 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# This section provides information about the driver. More specifically -# the name of the driver, its hostname, which is of use to create the -# service name and the port the driver is going to listen to. -# -# NOTE: this setting WILL ONLY take effect if there is no server configuration -# supplied to the container. In that case corresponding values stored -# in the configuration file will override these settings. -# -# In the specific case where a concrete configuration is supplied the -# the values for the host and the port MUST match the values entered -# here, because these values are used to create the service instance -# that exposes the relay deployment. -# -driver: - name: Relay Dummy Driver - host: relay-dummy-driver - port: 9080 - -# This section provides information about the network that is being -# proxied by the driver. At present time we only require to know the -# network name. This information is used to set the labels of the -# components generated by this chart (relay.dlt-interop.org/network) -# and should match the name of the network put in the relay configuration -# file if it is supplied. -# -# NOTE: this setting WILL ONLY take effect if a server configuration -# is not supplied to the relay. Otherwise, they will be overridden -# by the values in the actual configuration file. -# -network: - name: Relay Network - -# This section provides a way to customise the relay driver with -# additional environment variables that can be used to specialise -# the driver configuration file if a specific file is used. -environment: {} -# Uncomment this entry if you want to enable the debug mode of the -# driver startup script. This is also an example of how to add additional -# parameter that you would like to use to configure the relay. -# -# NOTE: If these are variable referenced in the server configuration -# template file they will only take effect if a server configuration -# is not supplied. -# -# - name: DEBUG -# value: "true" -# This section determines how the driver get to discover all the -# other components required for its operation. At present time -# it is only the relay server it needs to connect to. -# -discovery: - # This section specifies the details of the associated relay server that - # the driver is going to connect to. We need the information about the name, - # host, and port of the server. These details are exposed through environment - # variables and then injected in the relay configuration, via specialisation - # of the server configuration template. - # - # NOTE: these settings WILL NOT TAKE EFFECT if a specific configuration file - # is being supplied. - relay: - name: Relay Server - host: relay-server - port: 9080 - -# This section provides information about the configuration settings -# that are used to control the overall behaviour of the driver. We -# configure here the location of server configuration file and the -# configuration template file. -# -configuration: - # This is the path to the file that represents the driver configuration. - # The assigned value is the default value and does not need to be specified. - # If this file exists it will be used as it is. - path: /opt/relay/config/driver.toml - # This is the path to the driver configuration file template. The default - # value for the environment variable is shown. This file is used to generate - # the configuration at runtime based on the environment variables supplied - # to the relay driver and it is only used if a specific configuration file - # is not used. - # - templatePath: /opt/relay/config/driver.template.toml - - -# Additional information about the deployment of the driver -# such as the image being used, the number of replicas and -# the target namespace. -deployment: - image: dlt-interop/relay-driver:latest - imagePullPolicy: Always - namespace: default - replicas: 1 diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/Chart.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/Chart.yaml deleted file mode 100644 index c5de81e557..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/Chart.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: fabric-network -description: A Helm chart for deploying a Relay Server - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 1.0 \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/README.md b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/README.md deleted file mode 100644 index 62b9c47f97..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/README.md +++ /dev/null @@ -1,68 +0,0 @@ - -# Relay Server Helm Chart - -This Helm chart deploys an instance of a Relay Server and allows for customising the deployment of the relay via the default image built via the relay repository (suggested image is: `dlt-interop/relay-server`). - -## Basic Configuration - -The relay can be configured by specifying all of its required settings via the [values.yaml](values.yaml) file. The following aspects can be configured: - -- Relay server name (i.e. `server.name`) -- Relay server host (i.e. `server.host`): this will be used to create the associated service name. -- Relay server port (i.e. `server.port`): this will be used to create the associated service port. -- Driver name: (i.e. `discovery.driver.name`) -- Driver host: (i.e. `discovery.driver.host`): this should be set to the hostname/service name of the driver. -- Driver port: (i.e. `discovery.driver.port`): this should be set to the port of the driver (use the service port if deploying in K8s cluster) -- Additional configuration for remote relays. - -### Deployment details - -The following section of the configuration contains the details of the deployment in the cluster: - -```yaml - -deployment: - image: dlt-interop/relay-server:latest - imagePullPolicy: Always - replicas: 1 - namespace: default -``` - - -## Customising the Default Configuration - -The relay image allows for configuring more deeply the relay server by specifying the confguration files, -template server configuration, and root path forn the DNS configuration of the remote relay. These settings are available via the following configuration entries: - -- `configuration.path` : for the server configuration file, for supplying a specific confiuguration. -- `configuration.templatePath` : for specifying a given server template. -- `configuration.relaysPath` : for specifying a different root path for the relay entries. - -__NOTE__: This chart does not provides any functionality to create and specify the content of these files. These files at present time are expected to be already available via the image used for the deployment of the server. - -## Customising the Relays discovery - -This charts allows for specifying the details about the remote relays that this server should know about. This is done by adding entries in the following configuration settings: - -```yaml -discovery: - relays: - dns: - - group: fabric - entries: - - name: Relay Network 1 - host: relay.network1.dlt-interop.org - port: 9080 - - name: Relay Network 2 - host: relay.network2.dlt-interop.org - port: 9081 - - group: corda - entries: - ..... -``` - -This configuration creates a config map with two file entries (i.e. `fabric.toml` and `corda.toml`) containing the specification of the relays to be added to the server configuration file. The config map is mounted as a volume to the relay server deployment under the path identified by `configuration.relaysPath` or `/opt/relay/config/relays` if not specified. The startup script will do the rest to inject the relays configuration into the server configuration file. diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/NOTES.txt b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/NOTES.txt deleted file mode 100644 index 3460ffc235..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/NOTES.txt +++ /dev/null @@ -1,15 +0,0 @@ -Thank you for installaing {{ .Chart.Name }}. - -The relay server has been deployed as follows: - - Name: {{ .Values.server.name }} - Host: {{ .Values.server.host }} - Port: {{ .Values.server.port }} - -Your release is named {{ .Release.Name }}. - -To learn more about the release try: - - $ helm status {{ .Release.Name }} - $ helm get all {{ .Release.Name }} - diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/_helpers.tpl b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/_helpers.tpl deleted file mode 100644 index 8ce4e71a07..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/_helpers.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{- define "relay-server.labels" }} -relay.dlt-interop.org/role: "relay-server" -relay.dlt-interop.org/network: "{{ $.Values.network.name }}" -relay.dlt-interop.org/name: "{{ $.Values.driver.name }}" -app.kubernetes.io/component: "Relay Server" -app.kubernetes.io/name: "{{ .Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}" -app.kubernetes.io/managed-by: "{{ .Release.Service }}" -app.kubernetes.io/instance: "{{ .Release.Name }}" -app.kubernetes.io/version: "{{ .Chart.AppVersion }}" -{{- end }} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-configmap.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-configmap.yaml deleted file mode 100644 index 88a616c342..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-configmap.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- if $.Values.discovery.relays.dns -}} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $.Values.server.name }}-configmap - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: -{{ include "relay-server.labels" | indent 4 }} -data: -{{- range $.Values.discovery.relays.dns.entries -}} - {{ .group }}.toml: |- - {{- range .entries }} - [relays.{{.name}}] - hostname={{ quote .host }} - port={{ quote .port }} - - - {{- end }} -{{- end }} -{{- end -}} diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-deployment.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-deployment.yaml deleted file mode 100644 index 9e38709483..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-deployment.yaml +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Deployment -metadata: - name: {{ $.Values.server.name | default "Relay Server" }} - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: -{{ include "relay-server.labels" | indent 4}} -spec: - replicas: {{ $.Values.deployment.replicas | default 1 }} - selector: - matchLabels: - name: {{ $.Values.server.name }} - template: - metadata: - labels: - name: {{ $.Values.server.name }} - app: {{ $.Values.server.name }} -{{ include "relay-server.labels" $ | indent 8 }} - spec: - containers: - - name: {{ $.Values.server.name }} - image: {{ $.Values.deployment.image }} - {{- if $.Values.deployment.imagePullPolicy -}} - imagePullPolicy: {{ $.Values.deployment.imagePullPolicy }} - {{- end -}} - ports: - - containerPort: {{ $.Values.server.port }} - env: - {{- if $.Values.network.name -}} - - name: NETWORK_NAME - value: {{ $.Value.network.name -}} - {{- end -}} - {{- if $.Values.configuration -}} - {{- if $.Values.configuration.templatePath -}} - - name: RELAY_CONFIG_TEMPLATE - value: {{ $.Values.configuration.templatePath }} - {{- end -}} - {{- if $.Values.configuration.path -}} - - name: RELAY_CONFIG - value: {{ $.Values.configuration.templatePath }} - {{- end -}} - {{- if $.Values.configuration.relaysPath -}} - - name: RELAY_DNS_CONFIG - value: {{ $.Values.configuration.relaysPath }} - {{- end -}} - {{- end -}} - {{- if $.Values.discovery.driver -}} - - name: DRIVER_NAME - value: {{ #.Values.discovery.driver.name }} - - name: DRIVER_HOST - value: {{ #.Values.discovery.driver.host }} - - name: RDRIVER_PORT - value: {{ #.Values.discovery.driver.port }} - {{- end -}} - {{- range $.Values.environment }} - - name: {{ .name }} - - value: {{ .value }} - {{- end }} -{{- if $.Values.discovery.relays.dns -}} - volumeMounts: - - name: {{ $.Values.server.name }}-dns - mountPath: {{ $.Values.configuration.relaysPath | default "/opt/relay/config/relays" }} - volumes: - - name: {{ $.Values.server.name }}-dns - configMap: - name: {{ $.Values.server.name }}-configmap -{{- end -}} \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-service.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-service.yaml deleted file mode 100644 index dfbf6827a1..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/templates/server-service.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Service -metadata: - name: {{ $.Values.server.host }} - namespace: {{ $.Values.deployment.namespace | default "default" }} - labels: - app.kubernetes.io/component: "Relay Server" -{{ include "relay-server.labels" $ | indent 4 }} -spec: - type: ClusterIP - selector: - name: {{ $.Values.server.name }} - ports: - - protocol: TCP - port: {{ $.Values.server.port }} - name: grpc diff --git a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/values.yaml b/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/values.yaml deleted file mode 100644 index c57ce5dd1b..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/charts/relay-server/values.yaml +++ /dev/null @@ -1,121 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# This section provides information about the server. More specifically -# the name of the relay, its hostname, which is of use to create the -# service name and the port the relay is going to listen to. -# -# NOTE: this setting WILL ONLY take effect if there is no server configuration -# supplied to the container. In that case corresponding values stored -# in the configuration file will override these settings. -# -# In the specific case where a concrete configuration is supplied the -# the values for the host and the port MUST match the values entered -# here, because these values are used to create the service instance -# that exposes the relay deployment. -# -server: - name: Relay Server - host: relay-server - port: 9080 -# This section provides information about the network that is being -# proxied by the relay. At present time we only require to know the -# network name. -# -# NOTE: this setting WILL ONLY take effect if a server configuration -# is not supplied to the relay. Otherwise, they will be overridden -# by the values in the actual configuration file. -# -network: - name: Relay Network - -# This section provides a way to customise the relay server with -# additional environment variables that can be used to specialise -# the server configuration file if a specific file is used. -environment: {} -# Uncomment this entry if you want to enable the debug mode of the -# relay. This is also an example of how to add additional parameters -# that you would like to use to configure the relay. -# -# NOTE: If these are variable referenced in the server configuration -# template file they will only take effect if a server configuration -# is not supplied. -# -# - name: DEBUG -# value: "true" - -# This section determines how the relay get to discover all the -# other components required for its operation. At present time -# these are the associated driver and the remote relays. -# -discovery: - # This section specifies the details of the associated driver the server - # is going to work with. We need the information about the name, host, - # and port of the driver. These details are exposed through environment - # variables and then injected in the relay configuration, via specialisation - # of the server configuration template. - # - # NOTE: these settings WILL NOT TAKE EFFECT if a specific configuration file - # is being supplied. - driver: - name: Dummy Driver - host: dummy-driver - port: 9081 - # This section specifies the relay entries that are known to the relay server. - # These are currently added to the configuration file of the server, by creating - # a file that is named dns[..].group under the path specified by configuration.relaysPath. - relays: - # This property specifies a local set of DNS entries that are added to the - # relay server configuration file. In ther future other modes may be used. - # The system allows for allowing multiple DNS sets to be added to the - # configuration server which can be added as distinct files. The name of the - # name of the group determines the name of the file that is being created. - dns: - # This is the default group, which will generate a default.toml file, with - # a relay entry for each item in the entries array. - - group: default - entries: - - name: Relay Network 1 - host: relay1.network1.svc.cluster.local - port: 9081 - - name: Relay Network 2 - host: relay2.network2.svc.cluster.local - port: 9081 - -# This section provides information about the configuration settings -# that are used to control the overall behaviour of the relay. We -# configure here the location of server configuration file and the -# configuration template file. -# -configuration: - # This is the path to the file that represents the server configuration. - # The assigned value is the default value and does not need to be specified. - # If this file exists it will be used as it is in combination with the - # various remote relays that are provided in the discovery section. - path: /opt/relay/config/server.toml - # This is the path to the server configuration file template. The default - # value for the environment variable is shown. This file is used to generate - # the configuration at runtime based on the environment variables supplied - # to the relay server and it is only used if a specific configuration file - # is not used. - # - templatePath: /opt/relay/config/server.template.toml - # This is the path to the directory that stores all the configuration about - # the various relays that are known to the relay server. By default all the - # file with .toml extensions will be loaded in and added to the server - # configuration file. - # - relaysPath: /opt/relay/config/relays/ - - -# Additional information about the deployment of the server -# such as the image being used, the number of replicas and -# the target namespace. -deployment: - image: dlt-interop/relay-server:latest - imagePullPolicy: Always - namespace: default - replicas: 1 diff --git a/weaver/tests/network-setups/shared/charts/relay/values.yaml b/weaver/tests/network-setups/shared/charts/relay/values.yaml deleted file mode 100644 index 5c69355e1f..0000000000 --- a/weaver/tests/network-setups/shared/charts/relay/values.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -relay: - name: Network Relay - host: relay-server - port: 9080 - config: - path: /opt/relay/server/config/server.toml - templatePath: /opt/relay/config/server.template.toml - discovery: - mode: config - relaysConfigPath: /opt/relay/config/relays.toml - remoteRelays: - - relay1.svc.cluster.local - - relay2.svc.cluster.local - - relay3.svc.cluster.local -driver: -- name: - type: - \ No newline at end of file diff --git a/weaver/tests/network-setups/shared/charts/values/chaincode-interop.yaml b/weaver/tests/network-setups/shared/charts/values/chaincode-interop.yaml deleted file mode 100644 index 8da273fa28..0000000000 --- a/weaver/tests/network-setups/shared/charts/values/chaincode-interop.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -chaincodes: - - name: interop - channelName: mychannel - ordererName: ord0 - version: v1.0 - lang: golang - imageName: dlt-interop/chaincodes/interop - imageTag: latest - initFn: "init" - initArgs: "\"fnimcc\",\"snamcc\"" - endorsementPolicy: NA - collConfig: NA - sequence: 1 - artifactoryPath: res-dlt-interop-generic-local/fabric-test-environment/interop.zip diff --git a/weaver/tests/network-setups/shared/charts/values/corda-relay.yaml b/weaver/tests/network-setups/shared/charts/values/corda-relay.yaml deleted file mode 100644 index 9124054bcb..0000000000 --- a/weaver/tests/network-setups/shared/charts/values/corda-relay.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - name: corda-net1 - type: Corda - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "apps.ros2.cloud9.ibm.com" - -driver: - name: corda-driver - port: "9090" - configmap: false - -relay: - name: relay - port: "9080" - nodeport: "30050" - expose: false - discovery: - driver: - name: corda-driver - host: localhost - port: "9090" - relays: - dns: - - group: default - entries: - - name: relay-network1 - host: relay-network1 - port: "9080" - - name: relay-network2 - host: relay-network2 - port: "9080" - - name: relay-corda-net1 - host: relay-corda-net1 - port: "9080" - -deployment: - namespace: default diff --git a/weaver/tests/network-setups/shared/charts/values/corda-relay2.yaml b/weaver/tests/network-setups/shared/charts/values/corda-relay2.yaml deleted file mode 100644 index 4defa1ff51..0000000000 --- a/weaver/tests/network-setups/shared/charts/values/corda-relay2.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - name: network1 - type: Corda - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "apps.ros2.cloud9.ibm.com" - -driver: - name: corda-driver - port: "9090" - configmap: false - -relay: - name: relay - port: "9080" - nodeport: "30081" - expose: false - discovery: - driver: - name: corda-driver - host: localhost - port: "9090" - relays: - dns: - - group: default - entries: - - name: relay-network1 - host: relay-network1 - port: "9080" - - name: relay-corda-net1 - host: relay-corda-net1 - port: "9080" diff --git a/weaver/tests/network-setups/shared/charts/values/ibmcloud.yaml b/weaver/tests/network-setups/shared/charts/values/ibmcloud.yaml deleted file mode 100644 index b3a67dcd75..0000000000 --- a/weaver/tests/network-setups/shared/charts/values/ibmcloud.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - storageClass: ibmc-file-bronze-gid diff --git a/weaver/tests/network-setups/shared/charts/values/ic-relay.yaml b/weaver/tests/network-setups/shared/charts/values/ic-relay.yaml deleted file mode 100644 index ab965362e0..0000000000 --- a/weaver/tests/network-setups/shared/charts/values/ic-relay.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -relay: - discovery: - relays: - dns: - - group: default - entries: - - name: relay-network1 - host: relay-network1.testnet-interop-fabric-24e79b958bc67364a17abc9eccbb097f-0000.che01.containers.appdomain.cloud - port: "9080" - - name: relay-network2 - host: relay-network2.network2-tnet-iop-fabri-24e79b958bc67364a17abc9eccbb097f-0000.che01.containers.appdomain.cloud - port: "9080" diff --git a/weaver/tests/network-setups/shared/charts/values/ic-relay2.yaml b/weaver/tests/network-setups/shared/charts/values/ic-relay2.yaml deleted file mode 100644 index 952c3101a4..0000000000 --- a/weaver/tests/network-setups/shared/charts/values/ic-relay2.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - domain: - local: "dlt-interop-fabric2.svc.cluster.local" - cluster: "dlt-interop-fabric2.bx.cloud9.ibm.com" - -deployment: - namespace: dlt-interop-fabric2 diff --git a/weaver/tests/network-setups/shared/charts/values/oc.yaml b/weaver/tests/network-setups/shared/charts/values/oc.yaml deleted file mode 100644 index 3c5ce502f5..0000000000 --- a/weaver/tests/network-setups/shared/charts/values/oc.yaml +++ /dev/null @@ -1,104 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -global: - network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.sl.cloud9.ibm.com" - name: network1 - storageClass: nfs-storage - orderers: - - name: ord0 - profile: OneOrgOrdererGenesis - expose: false - orgList: "org1" - orgMSPList: "Org1MSP" - orgs: - - name: org1 - mspId: Org1MSP - ca: - deploy: true - expose: false - peers: - - name: peer0 - expose: false - orderer: orderer - channels: - - name: mychannel - profile: OneOrgChannel - orderer: orderer - orgs: - org1: - - peer0 - postgres: - expose: false - pvc: true - admin: - user: "pgadmin" - password: "pgadminpw" - db: "default" - storage: "500Mi" - - cluster: Kubernetes - - images: - postgres: - name: docker.io/bitnami/postgresql - version: 11.7.0-debian-10-r26 - ca: - name: hyperledger/fabric-ca - version: "1.4" - peer: - name: hyperledger/fabric-peer - version: "2.1" - orderer: - name: hyperledger/fabric-orderer - version: "2.1" - fabricTools: - name: hyperledger/fabric-tools - version: "2.1" - - postgresdb: - securityContext: - enabled: false - fsGroup: 1001 - runAsUser: 1001 - -deploycc: - chaincodes: - - name: fnimcc - channelName: mychannel - ordererName: ord0 - version: v1.0 - lang: golang - gitUrl: 'https://github.ibm.com/dlt-interoperability/proof-verification.git' - gitBranch: 'external_service' - gitSubPath: ./fnimcc/ - imageName: dlt-interop/chaincodes/fnimcc - imageTag: latest - artifactoryPath: res-dlt-interop-generic-local/proof-verification/fnimcc_fabric_v2.zip - initFn: "init" - initArgs: "" - endorsementPolicy: NA - collConfig: NA - sequence: 1 - - name: snamcc - channelName: mychannel - ordererName: ord0 - version: v1.0 - lang: golang - gitUrl: 'https://github.ibm.com/dlt-interoperability/proof-generation.git' - gitBranch: 'external_service' - gitSubPath: ./snamcc/ - imageName: dlt-interop/chaincodes/snamcc - imageTag: latest - artifactoryPath: res-dlt-interop-generic-local/proof-generation/snamcc_fabric_v2.zip - initFn: "init" - initArgs: "\"fnimcc\"" - endorsementPolicy: NA - collConfig: NA - sequence: 1 diff --git a/weaver/tests/network-setups/test/.gitkeep b/weaver/tests/network-setups/test/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/weaver/tests/network-setups/test/README.md b/weaver/tests/network-setups/test/README.md deleted file mode 100644 index 67fa316bb7..0000000000 --- a/weaver/tests/network-setups/test/README.md +++ /dev/null @@ -1,14 +0,0 @@ - -# Integration Test Setup - -This folder contains the network definitions and the script logic that is used to setup and configure -the networks in the integration test environment. There is one folder for each different type of network. - -- `fabric` contains the configuration settings for fabric networks -- `corda` contains the configuration settings for corda networks - -The networks are operated and managed via Kubernetes/Openshift. diff --git a/weaver/tests/network-setups/test/corda/.gitkeep b/weaver/tests/network-setups/test/corda/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/weaver/tests/network-setups/test/fabric/.gitkeep b/weaver/tests/network-setups/test/fabric/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/weaver/tests/network-setups/test/fabric/Makefile b/weaver/tests/network-setups/test/fabric/Makefile deleted file mode 100644 index 7f8ba9f583..0000000000 --- a/weaver/tests/network-setups/test/fabric/Makefile +++ /dev/null @@ -1,104 +0,0 @@ -all: deploy-pvc deploy-pg deploy-ca crypto-create artifacts deploy-ord init-external-builder deploy-peer create-channel join-channel deploy-cc -clean: del-ca del-ord del-peer del-jobs del-pg del-cc del-pvc - -deploy-pg: - kubectl apply -f k8s/postgres-secret.yaml - kubectl apply -f k8s/postgres-statefulset.yaml - kubectl apply -f k8s/postgres-service.yaml - sleep 20 - -deploy-pvc: - oc create -f k8s/pvc-network1-secrets.yaml - kubectl create configmap cc-scripts --from-file=scripts || true - -crypto-create: - kubectl apply -f k8s/job-gen-crypto-ord.yaml - kubectl apply -f k8s/job-gen-crypto-org1.yaml - sleep 5 - -artifacts: - kubectl create configmap network1-configtx --from-file=network1/configtx.yaml - kubectl apply -f k8s/job-gen-artifacts.yaml - -create-channel: - kubectl apply -f k8s/job-create-channel.yaml - sleep 10 - -join-channel: - kubectl apply -f k8s/job-join-channel.yaml - sleep 10 - -deploy-ca: - kubectl apply -f k8s/ca-dep.yaml - kubectl apply -f k8s/ca-svc.yaml - sleep 30 - -deploy-ord: - kubectl apply -f k8s/ord-dep.yaml - kubectl apply -f k8s/ord-svc.yaml - -init-external-builder: - kubectl create configmap external-builder --from-file=external-service-builder/bin || true - # kubectl apply -f k8s/fabric-cli.yaml || true - # sh ./copy-builder.sh - -deploy-peer: - kubectl create configmap peer-config --from-file=peer-config/core.yaml - kubectl apply -f k8s/peer-dep.yaml - kubectl apply -f k8s/peer-svc.yaml - sleep 30 - -del-pvc: - kubectl delete deployment fabric-cli || true - oc delete pvc network1-secrets || true - kubectl delete configmap network1-configtx || true - kubectl delete configmap cc-scripts || true - -del-ca: - kubectl delete deployment ca-orderer-network1 || true - kubectl delete deployment ca-org1-network1 || true - kubectl delete service ca-orderer-network1 || true - kubectl delete service ca-org1-network1 || true - -del-ord: - kubectl delete deployment ord0-orderers-network1 || true - kubectl delete service ord0-orderers-network1 || true - -del-peer: - kubectl delete deployment peer0-org1-network1 || true - kubectl delete service peer0-org1-network1 || true - kubectl delete configmap external-builder || true - kubectl delete configmap peer-config || true - -del-pg: - kubectl delete statefulset postgresql-network1 || true - kubectl delete service postgresql-network1 || true - kubectl delete secret postgresql-network1 || true - kubectl delete service postgresql-network1-headless || true - -del-jobs: - kubectl delete job gen-crypto-ord || true - kubectl delete job gen-crypto-org1 || true - kubectl delete job gen-artifacts || true - kubectl delete job create-channel || true - kubectl delete job join-channel || true - -build-sacc: - oc create -f chaincode-oc/git-resource.yaml - oc create -f chaincode-oc/image-resource.yaml - oc create -f chaincode-oc/cc-build.yaml - -del-build-sacc: - oc delete pipelineresource sacc-git || true - oc delete pipelineresource sacc-image2 || true - -build-cc: - kubectl template charts/buildcc > buildcc.yaml - oc create -f buildcc.yaml - rm buildcc.yaml - -deploy-cc: - helm install sacc-deploy charts/deploycc - -del-cc: - helm delete sacc-deploy || true diff --git a/weaver/tests/network-setups/test/fabric/cc-builder/build b/weaver/tests/network-setups/test/fabric/cc-builder/build deleted file mode 100755 index 10ed44a8ef..0000000000 --- a/weaver/tests/network-setups/test/fabric/cc-builder/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -CHAINCODE_SOURCE_DIR="$1" -CHAINCODE_METADATA_DIR="$2" -BUILD_OUTPUT_DIR="$3" - -# extract package path from metadata.json -GO_PACKAGE_PATH="$(jq -r .path "$CHAINCODE_METADATA_DIR/metadata.json")" -CC_NAME="$(jq -r .label "$CHAINCODE_METADATA_DIR/metadata.json")" -if [ -f "$CHAINCODE_SOURCE_DIR/src/go.mod" ]; then - cd "$CHAINCODE_SOURCE_DIR/src" - go build -v -mod=readonly -o "$BUILD_OUTPUT_DIR/${CC_NAME}" "$GO_PACKAGE_PATH" -else - GO111MODULE=off go build -v -o "$BUILD_OUTPUT_DIR/${CC_NAME}" "$GO_PACKAGE_PATH" -fi - -# save statedb index metadata to provide at release -if [ -d "$CHAINCODE_SOURCE_DIR/META-INF" ]; then - cp -a "$CHAINCODE_SOURCE_DIR/META-INF" "$BUILD_OUTPUT_DIR/" -fi - -go build -v -mod=readonly -o "/go/bin/fnimcc" "github.com/hyperledger/proof-verification/fnimcc" diff --git a/weaver/tests/network-setups/test/fabric/cc-builder/detect b/weaver/tests/network-setups/test/fabric/cc-builder/detect deleted file mode 100755 index 840791d69e..0000000000 --- a/weaver/tests/network-setups/test/fabric/cc-builder/detect +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -CHAINCODE_METADATA_DIR="$2" - -# use jq to extract the chaincode type from metadata.json and exit with -# success if the chaincode type is golang -if [ "$(jq -r .type "$CHAINCODE_METADATA_DIR/metadata.json" | tr '[:upper:]' '[:lower:]')" = "golang" ]; then - exit 0 -fi - -exit 1 diff --git a/weaver/tests/network-setups/test/fabric/cc-builder/release b/weaver/tests/network-setups/test/fabric/cc-builder/release deleted file mode 100755 index 62b21cb604..0000000000 --- a/weaver/tests/network-setups/test/fabric/cc-builder/release +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -BUILD_OUTPUT_DIR="$1" -RELEASE_OUTPUT_DIR="$2" - -# copy indexes from META-INF/* to the output directory -if [ -d "$BUILD_OUTPUT_DIR/META-INF" ] ; then - cp -a "$BUILD_OUTPUT_DIR/META-INF/"* "$RELEASE_OUTPUT_DIR/" -fi diff --git a/weaver/tests/network-setups/test/fabric/cc-builder/run b/weaver/tests/network-setups/test/fabric/cc-builder/run deleted file mode 100755 index 6d3c452371..0000000000 --- a/weaver/tests/network-setups/test/fabric/cc-builder/run +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -BUILD_OUTPUT_DIR="$1" -RUN_METADATA_DIR="$2" - -# setup the environment expected by the go chaincode shim -export CORE_CHAINCODE_ID_NAME="$(jq -r .chaincode_id "$RUN_METADATA_DIR/chaincode.json")" -export CORE_PEER_TLS_ENABLED="true" -export CORE_TLS_CLIENT_CERT_FILE="$RUN_METADATA_DIR/client.crt" -export CORE_TLS_CLIENT_KEY_FILE="$RUN_METADATA_DIR/client.key" -export CORE_PEER_TLS_ROOTCERT_FILE="$RUN_METADATA_DIR/root.crt" -export CORE_PEER_LOCALMSPID="$(jq -r .mspid "$RUN_METADATA_DIR/chaincode.json")" - -# populate the key and certificate material used by the go chaincode shim -jq -r .client_cert "$RUN_METADATA_DIR/chaincode.json" > "$CORE_TLS_CLIENT_CERT_FILE" -jq -r .client_key "$RUN_METADATA_DIR/chaincode.json" > "$CORE_TLS_CLIENT_KEY_FILE" -jq -r .root_cert "$RUN_METADATA_DIR/chaincode.json" > "$CORE_PEER_TLS_ROOTCERT_FILE" -if [ -z "$(jq -r .client_cert "$RUN_METADATA_DIR/chaincode.json")" ]; then - export CORE_PEER_TLS_ENABLED="false" -fi - -# exec the chaincode to replace the script with the chaincode process -exec "$BUILD_OUTPUT_DIR/chaincode" -peer.address="$(jq -r .peer_address "$ARTIFACTS/chaincode.json")" diff --git a/weaver/tests/network-setups/test/fabric/chaincode-oc/cc-build.yaml b/weaver/tests/network-setups/test/fabric/chaincode-oc/cc-build.yaml deleted file mode 100644 index 72a31eec1f..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode-oc/cc-build.yaml +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: tekton.dev/v1beta1 -kind: PipelineRun -metadata: - generation: 1 - labels: - tekton.dev/pipeline: chaincode-builder - name: chaincode-builder-sacc - namespace: dlt-interop -spec: - params: - - name: ccroot - value: ./test/fabric/chaincode/sacc/ - pipelineRef: - name: chaincode-builder - resources: - - name: git-repo-resource - resourceRef: - name: sacc-git - - name: image-resource - resourceRef: - name: sacc-image2 - serviceAccountName: pipeline diff --git a/weaver/tests/network-setups/test/fabric/chaincode-oc/git-resource.yaml b/weaver/tests/network-setups/test/fabric/chaincode-oc/git-resource.yaml deleted file mode 100644 index 7d500e7380..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode-oc/git-resource.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: sacc-git - namespace: dlt-interop -spec: - type: git - params: - - name: url - value: 'https://github.ibm.com/dlt-interoperability/network-setups.git' - - name: revision - value: feature/test-environment diff --git a/weaver/tests/network-setups/test/fabric/chaincode-oc/image-resource.yaml b/weaver/tests/network-setups/test/fabric/chaincode-oc/image-resource.yaml deleted file mode 100644 index 3f04cd0638..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode-oc/image-resource.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: sacc-image2 - namespace: dlt-interop -spec: - type: image - params: - - name: url - value: 'image-registry.openshift-image-registry.svc:5000/dlt-interop/sacc2:latest' diff --git a/weaver/tests/network-setups/test/fabric/chaincode-oc/job-cc-instantiate.yaml b/weaver/tests/network-setups/test/fabric/chaincode-oc/job-cc-instantiate.yaml deleted file mode 100644 index 8b7c40a936..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode-oc/job-cc-instantiate.yaml +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: batch/v1 -kind: Job -metadata: - name: cc-instantiate -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - - name: cc-scripts - configMap: - name: cc-scripts - containers: - - name: cc-instantiate - image: hyperledger/fabric-tools:2.1 - env: - - name: CC_NAME - value: sacc - - name: CC_VERSION - value: v1.0 - - name: CC_LANGUAGE - value: golang - - name: CC_INIT_FCN - value: "" - - name: CC_INIT_ARGS - value: '"a","10"' - - name: CC_END_POLICY - value: NA - - name: CC_COLL_CONFIG - value: NA - - name: CC_SEQUENCE - value: "1" - - name: MAX_RETRY - value: "5" - - name: DELAY - value: "3" - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: ORDERER_NAME - value: ord0-orderers-network1 - - name: ORDERER_URL - value: ord0-orderers-network1:7050 - - name: ORDERER_CA - value: /var/pvc1/ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/ca.crt - - name: CHANNEL_NAME - value: mychannel - - name: ORG - value: org1 - - name: ORG_LIST - value: "org1" - - name: ORGMSPS - value: "Org1MSP" - - name: NW_NAME - value: network1 - - name: PORT - value: "7051" - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - - name: cc-scripts - mountPath: /var/cc-scripts - command: ["/bin/sh", "-c"] - args: ['bash /var/cc-scripts/initCC.sh'] - restartPolicy: Never - backoffLimit: 4 diff --git a/weaver/tests/network-setups/test/fabric/chaincode-oc/job-cc-invoke.yaml b/weaver/tests/network-setups/test/fabric/chaincode-oc/job-cc-invoke.yaml deleted file mode 100644 index f542f04d9c..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode-oc/job-cc-invoke.yaml +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: batch/v1 -kind: Job -metadata: - name: cc-invoke -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: cc-invoke - image: hyperledger/fabric-tools:2.1 - env: - - name: CC_NAME - value: sacc - - name: CC_FCN - value: "set" - - name: CC_ARGS - value: "\"b\",\"20\"" - # - name: CC_ARGS - # value: "\"b\"" - - name: CHANNEL_NAME - value: mychannel - - name: ORG_LIST - value: "org1" - - name: CORE_PEER_LOCALMSPID - value: Org1MSP - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: /var/pvc1/peerOrganizations/org1/peers/peer0-org1-network1/tls/ca.crt - - name: CORE_PEER_MSPCONFIGPATH - value: /var/pvc1/peerOrganizations/org1/users/Admin@org1/msp - - name: CORE_PEER_ADDRESS - value: peer0-org1-network1:7051 - - name: ORDERER_NAME - value: ord0-orderers-network1 - - name: ORDERER_URL - value: ord0-orderers-network1:7050 - - name: ORDERER_CA - value: /var/pvc1/ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/ca.crt - - name: NW_NAME - value: network1 - - name: PORT - value: "7051" - - name: MAX_RETRY - value: "5" - - name: DELAY - value: "3" - - name: CORE_PEER_TLS_ENABLED - value: "true" - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['echo; - echo "===================== Invoking chaincode ${CC_NAME} on channel $CHANNEL_NAME... ===================== "; - PEER_CONN_PARAMS=""; - for org in $ORG_LIST; do - PEER_CONN_PARAMS=$PEER_CONN_PARAMS" --peerAddresses peer0-${org}-${NW_NAME}:${PORT} --tlsRootCertFiles /var/pvc1/peerOrganizations/${org}/peers/peer0-${org}-${NW_NAME}/tls/ca.crt"; - done; - set -x; - fcn_call="{\"function\":\""${CC_FCN}"\",\"Args\":["${CC_ARGS}"]}"; - echo invoke fcn call:${fcn_call}; - peer chaincode invoke -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls --cafile ${ORDERER_CA} -C ${CHANNEL_NAME} -n $CC_NAME ${PEER_CONN_PARAMS} -c ${fcn_call}; - set +x; - echo; - exit 0;'] - restartPolicy: Never - backoffLimit: 4 diff --git a/weaver/tests/network-setups/test/fabric/chaincode-oc/sacc-org1.yaml b/weaver/tests/network-setups/test/fabric/chaincode-oc/sacc-org1.yaml deleted file mode 100644 index 9cfc0bf1a1..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode-oc/sacc-org1.yaml +++ /dev/null @@ -1,165 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -#---------------- Chaincode Deployment --------------------- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: sacc-org1 -spec: - replicas: 1 - selector: - matchLabels: - name: sacc-org1 - template: - metadata: - labels: - name: sacc-org1 - app: sacc-org1 - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - image: image-registry.openshift-image-registry.svc:5000/dlt-interop/sacc:latest - name: sacc-org1 - imagePullPolicy: IfNotPresent - command: ["sh", "-c"] - args: ['set -a; - . /var/env/pkgid; - set +a; - echo $CHAINCODE_CCID; - ./sacc'] - env: - # - name: CHAINCODE_CCID - # value: "sacc:e5d873ce95b806bfe5bbfa60fe7cb33d77009c05f147bcf223795a2fbfd03c90" - - name: EXTERNAL_SERVICE - value: "true" - - name: CHAINCODE_ADDRESS - value: "0.0.0.0:7052" - ports: - - containerPort: 7052 - volumeMounts: - - name: network1-secrets - subPath: chaincodes/sacc-org1 - mountPath: /var/env - initContainers: - - name: cc-install - image: hyperledger/fabric-tools:2.1 - env: - - name: ARTIFACTORY_URL - value: https://na.artifactory.swg-devops.com/artifactory - - name: ARTIFACTORY_APIKEY - valueFrom: - secretKeyRef: - name: artifactory-apikey - key: apikey - - name: CC_PATH - value: res-dlt-interop-generic-local/fabric-test-environment/sacc.zip - - name: CC_NAME - value: sacc - - name: CC_VERSION - value: v1.0 - - name: CC_LANGUAGE - value: golang - - name: CC_INIT_FCN - value: "init" - - name: CC_INIT_ARGS - value: "\"a\",\"10\"" - - name: CC_END_POLICY - value: NA - - name: CC_COLL_CONFIG - value: NA - - name: CC_SEQUENCE - value: "1" - - name: MAX_RETRY - value: "5" - - name: DELAY - value: "3" - - name: ORG - value: org1 - - name: CORE_PEER_LOCALMSPID - value: Org1MSP - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: /var/pvc1/peerOrganizations/org1/peers/peer0-org1-network1/tls/ca.crt - - name: CORE_PEER_MSPCONFIGPATH - value: /var/pvc1/peerOrganizations/org1/users/Admin@org1/msp - - name: CORE_PEER_ADDRESS - value: peer0-org1-network1:7051 - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: ORDERER_NAME - value: ord0-orderers-network1 - - name: ORDERER_URL - value: ord0-orderers-network1:7050 - - name: ORDERER_CA - value: /var/pvc1/ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/ca.crt - - name: CHANNEL_NAME - value: mychannel - - name: NW_NAME - value: network1 - - name: PORT - value: "7051" - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['echo; - cd $GOPATH/src; - wget --header X-JFrog-Art-Api:$ARTIFACTORY_APIKEY $ARTIFACTORY_URL/$CC_PATH; - unzip $(basename $CC_PATH); - CC_PKG_FILE=${CC_NAME}.tar.gz; - CC_SRC_PATH=$GOPATH/src/$CC_NAME; - cp $CC_SRC_PATH/connection.json .; - cp $CC_SRC_PATH/metadata.json .; - tar cfz code.tar.gz connection.json; - tar cfz ${CC_PKG_FILE} code.tar.gz metadata.json; - rm code.tar.gz metadata.json connection.json; - echo "===================== Chaincode is packaged on peer0.org${ORG} ===================== "; - echo; - set -x; - peer lifecycle chaincode install ${CC_PKG_FILE}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "############# Chaincode installation on ${CORE_PEER_ADDRESS} has failed ##########"; - exit 1; - fi; - echo "===================== Chaincode is installed on ${CORE_PEER_ADDRESS} ===================== "; - set -x; - peer lifecycle chaincode queryinstalled >&~/log.txt; - res=$?; - set +x; - grep ${CC_NAME} ~/log.txt > logtemp.txt; - cat logtemp.txt; - PACKAGE_ID=$(sed -n "/${CC_NAME}/{s/^Package ID: //; s/, Label:.*$//; p;}" logtemp.txt); - if [ $res -ne 0 ]; then - echo "############# Query installed on ${CORE_PEER_ADDRESS} has failed ##########"; - exit 1; - fi; - echo PackageID is ${PACKAGE_ID}; - echo "===================== Query installed successful on ${CORE_PEER_ADDRESS} on channel ===================== "; - rm logtemp.txt; - - mkdir -p /var/pvc1/chaincodes/$CC_NAME-$ORG; - echo "CHAINCODE_CCID="$PACKAGE_ID > /var/pvc1/chaincodes/$CC_NAME-$ORG/pkgid; - exit 0;'] - ---- -apiVersion: v1 -kind: Service -metadata: - name: sacc-org1 - labels: - app: sacc-org1 -spec: - ports: - - name: grpc - port: 7052 - targetPort: 7052 - selector: - app: sacc-org1 diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/Dockerfile b/weaver/tests/network-setups/test/fabric/chaincode/sacc/Dockerfile deleted file mode 100644 index ac927420fc..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM golang:1.14.6-alpine AS build - -COPY . /go/src/github.com/sacc -WORKDIR /go/src/github.com/sacc - -# Build application -RUN go build -o sacc -v . - -# Production ready image -# Pass the binary to the prod image -FROM alpine:3.11 as prod - -COPY --from=build /go/src/github.com/sacc/sacc /app/sacc - -USER 1000 - -WORKDIR /app -CMD ./sacc diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/connection.json b/weaver/tests/network-setups/test/fabric/chaincode/sacc/connection.json deleted file mode 100644 index 0fb7fa768a..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/connection.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "address": "sacc-org1:7052", - "dial_timeout": "10s", - "tls_required": false, - "client_auth_required": false, - "client_key": "-----BEGIN EC PRIVATE KEY----- ... -----END EC PRIVATE KEY-----", - "client_cert": "-----BEGIN CERTIFICATE----- ... -----END CERTIFICATE-----", - "root_cert": "-----BEGIN CERTIFICATE---- ... -----END CERTIFICATE-----" -} diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/docker-compose.yaml b/weaver/tests/network-setups/test/fabric/chaincode/sacc/docker-compose.yaml deleted file mode 100644 index 45bacadf0f..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/docker-compose.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -version: "3" -networks: - default: - external: - name: network1 -services: - sacc-org1: - container_name: sacc-org1 - image: chaincode/sacc:latest - environment: - - CHAINCODE_CCID=sacc:3e02d2ce1e03160849fc3d693c9488c69d58981959bcf0637ebf1c8d5c6f0ef2 - - CHAINCODE_ADDRESS=0.0.0.0:7052 - ports: - - 7052:7052 diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/go.mod b/weaver/tests/network-setups/test/fabric/chaincode/sacc/go.mod deleted file mode 100644 index 0948a0e57f..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/go.mod +++ /dev/null @@ -1,8 +0,0 @@ -module sacc - -go 1.14 - -require ( - github.com/hyperledger/fabric-chaincode-go v0.0.0-20200728190242-9b3ae92d8664 - github.com/hyperledger/fabric-protos-go v0.0.0-20200819205323-f34c922b9e79 -) diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/go.sum b/weaver/tests/network-setups/test/fabric/chaincode/sacc/go.sum deleted file mode 100644 index 0b1ce9467f..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/go.sum +++ /dev/null @@ -1,45 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/hyperledger/fabric-chaincode-go v0.0.0-20200728190242-9b3ae92d8664 h1:Pu/9SNpo71SJj5DGehCXOKD9QGQ3MsuWjpsLM9Mkdwg= -github.com/hyperledger/fabric-chaincode-go v0.0.0-20200728190242-9b3ae92d8664/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc= -github.com/hyperledger/fabric-protos-go v0.0.0-20190919234611-2a87503ac7c9/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= -github.com/hyperledger/fabric-protos-go v0.0.0-20200819205323-f34c922b9e79 h1:ROrJn/Oax+H3vYzrC8tNwQU25+tEIxWuY2DEYIjViVA= -github.com/hyperledger/fabric-protos-go v0.0.0-20200819205323-f34c922b9e79/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190710143415-6ec70d6a5542/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw= -google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/metadata.json b/weaver/tests/network-setups/test/fabric/chaincode/sacc/metadata.json deleted file mode 100644 index 17d1e08fe0..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/metadata.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "path": "", - "type": "external", - "label": "sacc" -} diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/sacc.go b/weaver/tests/network-setups/test/fabric/chaincode/sacc/sacc.go deleted file mode 100644 index 27099be710..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/sacc.go +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright IBM Corp All Rights Reserved - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package main - -import ( - "fmt" - "os" - - "github.com/hyperledger/fabric-chaincode-go/shim" - "github.com/hyperledger/fabric-protos-go/peer" -) - -// SimpleAsset implements a simple chaincode to manage an asset -type SimpleAsset struct { -} - -// Init is called during chaincode instantiation to initialize any -// data. Note that chaincode upgrade also calls this function to reset -// or to migrate data. -func (t *SimpleAsset) Init(stub shim.ChaincodeStubInterface) peer.Response { - // Get the args from the transaction proposal - args := stub.GetStringArgs() - if len(args) != 2 { - return shim.Error("Incorrect arguments. Expecting a key and a value") - } - - // Set up any variables or assets here by calling stub.PutState() - - // We store the key and the value on the ledger - err := stub.PutState(args[0], []byte(args[1])) - if err != nil { - return shim.Error(fmt.Sprintf("Failed to create asset: %s", args[0])) - } - return shim.Success(nil) -} - -// Invoke is called per transaction on the chaincode. Each transaction is -// either a 'get' or a 'set' on the asset created by Init function. The Set -// method may create a new asset by specifying a new key-value pair. -func (t *SimpleAsset) Invoke(stub shim.ChaincodeStubInterface) peer.Response { - // Extract the function and args from the transaction proposal - fn, args := stub.GetFunctionAndParameters() - - var result string - var err error - if fn == "set" { - result, err = set(stub, args) - } else { // assume 'get' even if fn is nil - result, err = get(stub, args) - } - if err != nil { - return shim.Error(err.Error()) - } - - // Return the result as success payload - return shim.Success([]byte(result)) -} - -// Set stores the asset (both key and value) on the ledger. If the key exists, -// it will override the value with the new one -func set(stub shim.ChaincodeStubInterface, args []string) (string, error) { - if len(args) != 2 { - return "", fmt.Errorf("Incorrect arguments. Expecting a key and a value") - } - - err := stub.PutState(args[0], []byte(args[1])) - if err != nil { - return "", fmt.Errorf("Failed to set asset: %s", args[0]) - } - return args[1], nil -} - -// Get returns the value of the specified asset key -func get(stub shim.ChaincodeStubInterface, args []string) (string, error) { - if len(args) != 1 { - return "", fmt.Errorf("Incorrect arguments. Expecting a key") - } - - value, err := stub.GetState(args[0]) - if err != nil { - return "", fmt.Errorf("Failed to get asset: %s with error: %s", args[0], err) - } - if value == nil { - return "", fmt.Errorf("Asset not found: %s", args[0]) - } - return string(value), nil -} - -// main function starts up the chaincode in the container during instantiate -func main() { - server := &shim.ChaincodeServer{ - CCID: os.Getenv("CHAINCODE_CCID"), - Address: os.Getenv("CHAINCODE_ADDRESS"), - CC: new(SimpleAsset), - TLSProps: shim.TLSProperties{ - Disabled: true, - }, - } - - // Start the chaincode external server - err := server.Start() - - if err != nil { - fmt.Printf("Error starting SACC chaincode: %s", err) - } -} diff --git a/weaver/tests/network-setups/test/fabric/chaincode/sacc/sacc_test.go b/weaver/tests/network-setups/test/fabric/chaincode/sacc/sacc_test.go deleted file mode 100644 index 7ab39c9afc..0000000000 --- a/weaver/tests/network-setups/test/fabric/chaincode/sacc/sacc_test.go +++ /dev/null @@ -1,174 +0,0 @@ -/* -Copyright Hitachi America Ltd. All Rights Reserved. - -SPDX-License-Identifier: Apache-2.0 -*/ - -package main - -import ( - "fmt" - "testing" - - "github.com/hyperledger/fabric-chaincode-go/shim" - "github.com/hyperledger/fabric-chaincode-go/shimtest" -) - -func checkInit(t *testing.T, stub *shimtest.MockStub, args [][]byte) { - res := stub.MockInit("1", args) - if res.Status != shim.OK { - fmt.Println("Init failed", string(res.Message)) - t.FailNow() - } -} - -func checkState(t *testing.T, stub *shimtest.MockStub, name string, value string) { - bytes := stub.State[name] - if bytes == nil { - fmt.Println("State", name, "failed to get value") - t.FailNow() - } - if string(bytes) != value { - fmt.Println("State value", name, "was not", value, "as expected") - t.FailNow() - } -} - -func checkQuery(t *testing.T, stub *shimtest.MockStub, name string, value string) { - res := stub.MockInvoke("1", [][]byte{[]byte("query"), []byte(name)}) - if res.Status != shim.OK { - fmt.Println("Query", name, "failed", string(res.Message)) - t.FailNow() - } - if res.Payload == nil { - fmt.Println("Query", name, "failed to get value") - t.FailNow() - } - if string(res.Payload) != value { - fmt.Println("Query value", name, "was not", value, "as expected") - t.FailNow() - } -} - -func checkInvoke(t *testing.T, stub *shimtest.MockStub, args [][]byte) { - res := stub.MockInvoke("1", args) - if res.Status != shim.OK { - fmt.Println("Invoke", args, "failed", string(res.Message)) - t.FailNow() - } -} - -func TestSacc_Init(t *testing.T) { - cc := new(SimpleAsset) - stub := shimtest.NewMockStub("sacc", cc) - - // Init a=10 - checkInit(t, stub, [][]byte{[]byte("a"), []byte("10")}) - - checkState(t, stub, "a", "10") -} - -func TestSacc_Query(t *testing.T) { - cc := new(SimpleAsset) - stub := shimtest.NewMockStub("sacc", cc) - - // Init a=10 - checkInit(t, stub, [][]byte{[]byte("a"), []byte("10")}) - - // Query a - checkQuery(t, stub, "a", "10") -} - -func TestSacc_Invoke(t *testing.T) { - cc := new(SimpleAsset) - stub := shimtest.NewMockStub("sacc", cc) - - // Init a=10 - checkInit(t, stub, [][]byte{[]byte("a"), []byte("10")}) - - // Invoke: Set a=20 - checkInvoke(t, stub, [][]byte{[]byte("set"), []byte("a"), []byte("20")}) - - // Query a - checkQuery(t, stub, "a", "20") -} - -func TestSacc_InitWithIncorrectArguments(t *testing.T) { - cc := new(SimpleAsset) - stub := shimtest.NewMockStub("sacc", cc) - - // Init with incorrect arguments - res := stub.MockInit("1", [][]byte{[]byte("a"), []byte("10"), []byte("10")}) - - if res.Status != shim.ERROR { - fmt.Println("Invalid Init accepted") - t.FailNow() - } - - if res.Message != "Incorrect arguments. Expecting a key and a value" { - fmt.Println("Unexpected Error message:", string(res.Message)) - t.FailNow() - } -} - -func TestSacc_QueryWithIncorrectArguments(t *testing.T) { - cc := new(SimpleAsset) - stub := shimtest.NewMockStub("sacc", cc) - - // Init a=10 - checkInit(t, stub, [][]byte{[]byte("a"), []byte("10")}) - - // Query with incorrect arguments - res := stub.MockInvoke("1", [][]byte{[]byte("query"), []byte("a"), []byte("b")}) - - if res.Status != shim.ERROR { - fmt.Println("Invalid query accepted") - t.FailNow() - } - - if res.Message != "Incorrect arguments. Expecting a key" { - fmt.Println("Unexpected Error message:", string(res.Message)) - t.FailNow() - } -} - -func TestSacc_QueryForAssetNotFound(t *testing.T) { - cc := new(SimpleAsset) - stub := shimtest.NewMockStub("sacc", cc) - - // Init a=10 - checkInit(t, stub, [][]byte{[]byte("a"), []byte("10")}) - - // Query for b (as a asset not found) - res := stub.MockInvoke("1", [][]byte{[]byte("query"), []byte("b")}) - - if res.Status != shim.ERROR { - fmt.Println("Invalid query accepted") - t.FailNow() - } - - if res.Message != "Asset not found: b" { - fmt.Println("Unexpected Error message:", string(res.Message)) - t.FailNow() - } -} - -func TestSacc_InvokeWithIncorrectArguments(t *testing.T) { - cc := new(SimpleAsset) - stub := shimtest.NewMockStub("sacc", cc) - - // Init a=10 - checkInit(t, stub, [][]byte{[]byte("a"), []byte("10")}) - - // Invoke with incorrect arguments - res := stub.MockInvoke("1", [][]byte{[]byte("set"), []byte("a")}) - if res.Status != shim.ERROR { - fmt.Println("Invalid Invoke accepted") - t.FailNow() - } - - if res.Message != "Incorrect arguments. Expecting a key and a value" { - fmt.Println("Unexpected Error message:", string(res.Message)) - t.FailNow() - } -} diff --git a/weaver/tests/network-setups/test/fabric/charts/buildcc/.helmignore b/weaver/tests/network-setups/test/fabric/charts/buildcc/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/buildcc/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/test/fabric/charts/buildcc/Chart.yaml b/weaver/tests/network-setups/test/fabric/charts/buildcc/Chart.yaml deleted file mode 100644 index 49f2baae78..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/buildcc/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: buildcc -description: A Helm chart for openshift pipeline to build cc image -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/01-git-resource.yaml b/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/01-git-resource.yaml deleted file mode 100644 index ca10d846a8..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/01-git-resource.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: {{ printf "%s-git" $.Values.network.chaincode.name }} -spec: - type: git - params: - - name: url - value: {{ $.Values.network.chaincode.git }} - - name: revision - value: {{ $.Values.network.chaincode.branch }} - ---- diff --git a/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/01-image-resource.yaml b/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/01-image-resource.yaml deleted file mode 100644 index e3280ccb7e..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/01-image-resource.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $ccImage := printf "%s/%s:%s" $.Values.network.chaincode.imageRegistry $.Values.network.chaincode.imageName $.Values.network.chaincode.imageTag -}} -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: {{ printf "%s-image" $.Values.network.chaincode.name }} -spec: - type: image - params: - - name: url - value: {{ $ccImage }} - ---- diff --git a/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/02-cc-build.yaml b/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/02-cc-build.yaml deleted file mode 100644 index bd3c515e7c..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/buildcc/templates/02-cc-build.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: tekton.dev/v1beta1 -kind: PipelineRun -metadata: - generation: 1 - labels: - tekton.dev/pipeline: chaincode-builder - name: {{ printf "chaincode-builder-%s" $.Values.network.chaincode.name }} -spec: - params: - - name: ccroot - value: {{ $.Values.network.chaincode.subPath }} - pipelineRef: - name: chaincode-builder - resources: - - name: git-repo-resource - resourceRef: - name: {{ printf "%s-git" $.Values.network.chaincode.name }} - - name: image-resource - resourceRef: - name: {{ printf "%s-image" $.Values.network.chaincode.name }} - serviceAccountName: pipeline - ---- diff --git a/weaver/tests/network-setups/test/fabric/charts/buildcc/values.yaml b/weaver/tests/network-setups/test/fabric/charts/buildcc/values.yaml deleted file mode 100644 index 11b3aa50e7..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/buildcc/values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.sl.cloud9.ibm.com" - chaincode: - name: sacc - version: v1.0 - lang: golang - git: 'https://github.ibm.com/dlt-interoperability/network-setups.git' - branch: feature/test-environment - subPath: ./test/fabric/chaincode/sacc/ - imageRegistry: image-registry.openshift-image-registry.svc:5000/dlt-interop - imageName: sacc - imageTag: latest - initFn: "init" - initArgs: '"a","10"' - endorsementPolicy: NA - collConfig: NA - sequence: 1 diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/.helmignore b/weaver/tests/network-setups/test/fabric/charts/deploycc/.helmignore deleted file mode 100644 index 0e8a0eb36f..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/Chart.yaml b/weaver/tests/network-setups/test/fabric/charts/deploycc/Chart.yaml deleted file mode 100644 index 0d548f4910..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/Chart.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v2 -name: deploycc -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. -appVersion: 1.16.0 diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/bkp/configMap.yaml b/weaver/tests/network-setups/test/fabric/charts/deploycc/bkp/configMap.yaml deleted file mode 100644 index d8c8074731..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/bkp/configMap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: ConfigMap -metadata: - name: cc-scripts -data: - initCC.sh: |- -{{ .Files.Get "initCC.sh" | indent 4}} ---- diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/bkp/initCC.sh b/weaver/tests/network-setups/test/fabric/charts/deploycc/bkp/initCC.sh deleted file mode 100644 index e9ec84f80f..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/bkp/initCC.sh +++ /dev/null @@ -1,242 +0,0 @@ -#!/bin/bash - -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -INIT_REQUIRED="--init-required" -if [ "$CC_INIT_FCN" = "NA" ]; then - INIT_REQUIRED="" -fi - -if [ "$CC_END_POLICY" = "NA" ]; then - CC_END_POLICY="" -else - CC_END_POLICY="--signature-policy $CC_END_POLICY" -fi - -if [ "$CC_COLL_CONFIG" = "NA" ]; then - CC_COLL_CONFIG="" -else - CC_COLL_CONFIG="--collections-config $CC_COLL_CONFIG" -fi - -setGlobals() { - local USING_ORG="" - ORG=$1 - ORGMSP=`echo ${ORG:0:1} | tr '[a-z]' '[A-Z]'`${ORG:1}"MSP" - echo "Using organization ${ORG}, MSP: ${ORGMSP}" - export CORE_PEER_LOCALMSPID=${ORGMSP} - export CORE_PEER_TLS_ROOTCERT_FILE=/var/pvc1/peerOrganizations/${ORG}/peers/peer0-${ORG}-${NW_NAME}/tls/ca.crt - export CORE_PEER_MSPCONFIGPATH=/var/pvc1/peerOrganizations/${ORG}/users/Admin@${ORG}/msp - export CORE_PEER_ADDRESS=peer0-${ORG}-${NW_NAME}:${PORT} - - if [ "$VERBOSE" == "true" ]; then - env | grep CORE - fi -} - -# parsePeerConnectionParameters $@ -# Helper function that sets the peer connection parameters for a chaincode -# operation -parsePeerConnectionParameters() { - PEER_CONN_PARAMS="" - for org in $ORG_LIST; do - PEER_CONN_PARAMS=$PEER_CONN_PARAMS" --peerAddresses peer0-${org}-${NW_NAME}:${PORT} --tlsRootCertFiles /var/pvc1/peerOrganizations/${org}/peers/peer0-${org}-${NW_NAME}/tls/ca.crt" - done -} - -verifyResult() { - if [ $1 -ne 0 ]; then - echo "############# $2 .##########" - echo - exit 1 - fi -} - -# queryInstalled PEER ORG -queryInstalled() { - ORG=$1 - setGlobals $ORG - set -x - peer lifecycle chaincode queryinstalled >&~/log.txt - res=$? - set +x - grep ${CC_NAME} ~/log.txt > logtemp.txt - cat logtemp.txt - PACKAGE_ID=$(sed -n "/${CC_NAME}/{s/^Package ID: //; s/, Label:.*$//; p;}" logtemp.txt) - verifyResult $res "Query installed on ${CORE_PEER_ADDRESS} has failed" - echo PackageID is ${PACKAGE_ID} - echo "===================== Query installed successful on ${CORE_PEER_ADDRESS} on channel ===================== " - echo - rm logtemp.txt -} - -# approveForMyOrg VERSION PEER ORG -approveForMyOrg() { - ORG=$1 - setGlobals $ORG - set -x - peer lifecycle chaincode approveformyorg -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA --channelID $CHANNEL_NAME --name ${CC_NAME} --version ${CC_VERSION} --init-required --package-id ${PACKAGE_ID} --sequence ${CC_SEQUENCE} >&~/log.txt - set +x - cat ~/log.txt - verifyResult $res "Chaincode definition approved on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' failed" - echo "===================== Chaincode definition approved on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -# checkCommitReadiness VERSION PEER ORG -checkCommitReadiness() { - ORG=$1 - setGlobals $ORG - echo "===================== Checking the commit readiness of the chaincode definition on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME'... ===================== " - local rc=1 - local COUNTER=1 - # continue to poll - # we either get a successful response, or reach MAX RETRY - while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do - sleep $DELAY - echo "Attempting to check the commit readiness of the chaincode definition on ${CORE_PEER_ADDRESS}, Retry after $DELAY seconds." - set -x - peer lifecycle chaincode checkcommitreadiness --channelID ${CHANNEL_NAME} --name ${CC_NAME} --version ${CC_VERSION} --sequence ${CC_SEQUENCE} ${INIT_REQUIRED} ${CC_END_POLICY} ${CC_COLL_CONFIG} --output json >&~/log.txt - res=$? - set +x - let rc=0 - for var in "$@"; do - if [ "$var" != "$ORG" ]; then - echo 'var...'$var - grep "$var" ~/log.txt &>/dev/null || let rc=1 - fi - done - COUNTER=$(expr $COUNTER + 1) - done - cat ~/log.txt - if test $rc -eq 0; then - echo "===================== Checking the commit readiness of the chaincode definition successful on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - else - echo - echo $'\e[1;31m'"############### After $MAX_RETRY attempts, Check commit readiness result on ${CORE_PEER_ADDRESS} is INVALID ###############!"$'\e[0m' - echo - exit 1 - fi -} - -# commitChaincodeDefinition VERSION PEER ORG (PEER ORG)... -commitChaincodeDefinition() { - parsePeerConnectionParameters - res=$? - verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " - - # while 'peer chaincode' command can get the orderer endpoint from the - # peer (if join was successful), let's supply it directly as we know - # it using the "-o" option - - set -x - peer lifecycle chaincode commit -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA --channelID $CHANNEL_NAME --name ${CC_NAME} $PEER_CONN_PARAMS --version ${CC_VERSION} --sequence ${CC_SEQUENCE} ${INIT_REQUIRED} ${CC_END_POLICY} ${CC_COLL_CONFIG} >&~/log.txt - res=$? - set +x - cat ~/log.txt - verifyResult $res "Chaincode definition commit failed on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' failed" - echo "===================== Chaincode definition committed on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -# queryCommitted ORG -queryCommitted() { - ORG=$1 - setGlobals $ORG - EXPECTED_RESULT="Version: ${CC_VERSION}, Sequence: ${CC_SEQUENCE}, Endorsement Plugin: escc, Validation Plugin: vscc" - echo "===================== Querying chaincode definition on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME'... ===================== " - local rc=1 - local COUNTER=1 - # continue to poll - # we either get a successful response, or reach MAX RETRY - while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do - sleep $DELAY - echo "Attempting to Query committed status on ${CORE_PEER_ADDRESS}, Retry after $DELAY seconds." - set -x - peer lifecycle chaincode querycommitted --channelID $CHANNEL_NAME --name ${CC_NAME} >&~/log.txt - res=$? - set +x - test $res -eq 0 && VALUE=$(cat ~/log.txt | grep -o '^Version: '$CC_VERSION', Sequence: [0-9], Endorsement Plugin: escc, Validation Plugin: vscc') - test "$VALUE" = "$EXPECTED_RESULT" && let rc=0 - COUNTER=$(expr $COUNTER + 1) - done - echo - cat ~/log.txt - if test $rc -eq 0; then - echo "===================== Query chaincode definition successful on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - echo - else - echo "############### After $MAX_RETRY attempts, Query chaincode definition result on ${CORE_PEER_ADDRESS} is INVALID ###############!" - echo - exit 1 - fi - sleep 1 -} - -chaincodeInvokeInit() { - parsePeerConnectionParameters - res=$? - verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " - - # while 'peer chaincode' command can get the orderer endpoint from the - # peer (if join was successful), let's supply it directly as we know - # it using the "-o" option - set -x - if [ "$CC_INIT_FCN" = "" ]; then - fcn_call='{"Args":['${CC_INIT_ARGS}']}' - else - fcn_call='{"function":"'${CC_INIT_FCN}'","Args":['${CC_INIT_ARGS}']}' - fi - - echo invoke fcn call:${fcn_call} - peer chaincode invoke -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n ${CC_NAME} $PEER_CONN_PARAMS --isInit -c ${fcn_call} >&~/log.txt - res=$? - set +x - cat ~/log.txt - verifyResult $res "Invoke execution on PEERS failed " - echo "===================== Invoke transaction successful on PEERS on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -CC_PKG_FILE=${CC_NAME}.tar.gz - -## query whether the chaincode is installed -queryInstalled ${ORG} - -## approve the definition -for org in $ORG_LIST; do - approveForMyOrg ${org} -done - -TMP_PARAMS="" -for org in $ORGMSPS; do - TMP_PARAMS=$TMP_PARAMS" \""$org"\": true" -done -echo 'PARAMS..'${TMP_PARAMS} -for org in $ORG_LIST; do - checkCommitReadiness ${org} ${TMP_PARAMS} -done - -## commit the definition -commitChaincodeDefinition - -## query on all orgs to see that the definition committed successfully -for org in $ORG_LIST; do - queryCommitted ${org} -done - -## Invoke the chaincode - this does require that the chaincode have the 'initLedger' -## method defined -if [ "$CC_INIT_FCN" = "NA" ]; then - echo "===================== Chaincode initialization is not required ===================== " - echo -else - chaincodeInvokeInit -fi - -exit 0 diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/deployment.yaml b/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/deployment.yaml deleted file mode 100644 index 29d8240993..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/deployment.yaml +++ /dev/null @@ -1,116 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-secrets" $.Values.network.name -}} -{{- $ccImage := printf "%s/%s:%s" $.Values.network.chaincode.imageRegistry $.Values.network.chaincode.imageName $.Values.network.chaincode.imageTag -}} -{{- range $.Values.network.orgs }} -{{- $orgName := .name -}} -{{- $orgMSP := .msp -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.network.name -}} -{{- $peerAddress := printf "%s:%s" $peerName .port -}} -{{- $deployccName := printf "%s-%s" $.Values.network.chaincode.name $peerName -}} - -#---------------- Chaincode Deployment --------------------- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ $deployccName }} -spec: - replicas: 1 - selector: - matchLabels: - name: {{ $deployccName }} - template: - metadata: - labels: - name: {{ $deployccName }} - app: {{ $deployccName }} - spec: - volumes: - - name: pvc1 - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: cc-scripts - configMap: - name: cc-scripts - containers: - - image: {{ $ccImage }} - name: chaincode - imagePullPolicy: IfNotPresent - command: ["sh", "-c"] - args: ['set -a; - . /var/env/pkgid; - set +a; - echo $CHAINCODE_CCID; - ./$CC_NAME'] - env: - - name: CC_NAME - value: {{ $.Values.network.chaincode.name }} - - name: EXTERNAL_SERVICE - value: "true" - - name: CHAINCODE_ADDRESS - value: "0.0.0.0:7052" - ports: - - containerPort: 7052 - volumeMounts: - - name: pvc1 - subPath: {{ printf "chaincodes/%s" $deployccName }} - mountPath: /var/env - initContainers: - - name: cc-install - image: hyperledger/fabric-tools:2.1 - env: - - name: ARTIFACTORY_URL - value: {{ $.Values.network.artifactory.url }} - - name: ARTIFACTORY_APIKEY - valueFrom: - secretKeyRef: - name: {{ $.Values.network.artifactory.secret }} - key: {{ $.Values.network.artifactory.secretKey }} - - name: CC_PATH - value: {{ $.Values.network.artifactory.path }} - - name: CC_NAME - value: {{ $.Values.network.chaincode.name }} - - name: CC_VERSION - value: "{{ $.Values.network.chaincode.version }}" - - name: CC_LANGUAGE - value: {{ $.Values.network.chaincode.lang }} - - name: ORG - value: {{ $orgName }} - - name: CORE_PEER_LOCALMSPID - value: {{ $orgMSP }} - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: {{ printf "/var/pvc1/%s" .tlsRootCertPath }} - - name: CORE_PEER_MSPCONFIGPATH - value: {{ printf "/var/pvc1/%s" .mspConfigPath }} - - name: CORE_PEER_ADDRESS - value: {{ $peerAddress }} - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: ORDERER_NAME - value: {{ $.Values.network.orderer.name }} - - name: ORDERER_URL - value: {{ $.Values.network.orderer.url }} - - name: ORDERER_CA - value: {{ printf "/var/pvc1/%s" $.Values.network.orderer.cacert }} - - name: CHANNEL_NAME - value: {{ $.Values.network.channelName }} - - name: NW_NAME - value: {{ $.Values.network.name }} - - name: DEPLOYCC_NAME - value: {{ $deployccName }} - volumeMounts: - - name: pvc1 - mountPath: /var/pvc1 - - name: cc-scripts - mountPath: /var/cc-scripts - command: ["/bin/sh", "-c"] - args: ["bash /var/cc-scripts/installCC.sh"] - ---- -{{- end }} -{{- end }} diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/job.yaml b/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/job.yaml deleted file mode 100644 index ff92a00e16..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/job.yaml +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- $volumeClaimName := printf "%s-secrets" $.Values.network.name -}} -{{- $jobName := printf "instantiate-%s" $.Values.network.chaincode.name -}} - -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ $jobName }} -spec: - template: - spec: - volumes: - - name: pvc1 - persistentVolumeClaim: - claimName: {{ $volumeClaimName }} - - name: cc-scripts - configMap: - name: cc-scripts - containers: - - name: cc-instantiate - image: hyperledger/fabric-tools:2.1 - env: - - name: CC_NAME - value: {{ $.Values.network.chaincode.name }} - - name: CC_VERSION - value: "{{ $.Values.network.chaincode.version }}" - - name: CC_LANGUAGE - value: {{ $.Values.network.chaincode.lang }} - - name: CC_INIT_FCN - value: {{ $.Values.network.chaincode.initFn }} - - name: CC_INIT_ARGS - value: '{{ $.Values.network.chaincode.initArgs }}' - - name: CC_END_POLICY - value: "{{ $.Values.network.chaincode.endorsementPolicy }}" - - name: CC_COLL_CONFIG - value: {{ $.Values.network.chaincode.collConfig }} - - name: CC_SEQUENCE - value: "{{ $.Values.network.chaincode.sequence }}" - - name: MAX_RETRY - value: "5" - - name: DELAY - value: "3" - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: ORDERER_NAME - value: {{ $.Values.network.orderer.name }} - - name: ORDERER_URL - value: {{ $.Values.network.orderer.url }} - - name: ORDERER_CA - value: {{ printf "/var/pvc1/%s" $.Values.network.orderer.cacert }} - - name: CHANNEL_NAME - value: {{ $.Values.network.channelName }} - - name: ORG_LIST - value: "{{ $.Values.network.orgList }}" - - name: ORGMSPS - value: "{{ $.Values.network.orgMSPList }}" - - name: NW_NAME - value: {{ $.Values.network.name }} - - name: PORT - value: "{{ $.Values.network.peerPort }}" - volumeMounts: - - name: pvc1 - mountPath: /var/pvc1 - - name: cc-scripts - mountPath: /var/cc-scripts - command: ["/bin/sh", "-c"] - args: ['bash /var/cc-scripts/initCC.sh'] - restartPolicy: Never - backoffLimit: 1 ---- diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/service.yaml b/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/service.yaml deleted file mode 100644 index dada292198..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/templates/service.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -{{- range $.Values.network.orgs }} -{{- $orgName := .name -}} -{{- range .peers }} -{{- $peerName := printf "%s-%s-%s" .name $orgName $.Values.network.name -}} -{{- $deployccName := printf "%s-%s" $.Values.network.chaincode.name $peerName -}} - -apiVersion: v1 -kind: Service -metadata: - name: {{ $deployccName }} - labels: - app: {{ $deployccName }} -spec: - ports: - - name: grpc - port: 7052 - targetPort: 7052 - selector: - app: {{ $deployccName }} ---- - -{{- end }} -{{- end }} diff --git a/weaver/tests/network-setups/test/fabric/charts/deploycc/values.yaml b/weaver/tests/network-setups/test/fabric/charts/deploycc/values.yaml deleted file mode 100644 index fde9882e02..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/deploycc/values.yaml +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - domain: - local: "dlt-interop.svc.cluster.local" - cluster: "dlt-interop.apps.ros2.sl.cloud9.ibm.com" - name: network1 - channelName: mychannel - orgList: "org1" - orgMSPList: "Org1MSP" - peerPort: "7051" - chaincode: - name: sacc - version: v1.0 - lang: golang - git: 'https://github.ibm.com/dlt-interoperability/network-setups.git' - branch: feature/test-environment - subPath: - imageRegistry: image-registry.openshift-image-registry.svc:5000/dlt-interop - imageName: sacc - imageTag: "2.0" - initFn: "" - initArgs: '"a","10"' - endorsementPolicy: NA - collConfig: NA - sequence: 1 - orderer: - name: ord0-orderers-network1 - url: ord0-orderers-network1:7050 - cacert: ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/ca.crt - orgs: - - name: org1 - msp: Org1MSP - peers: - - name: peer0 - port: "7051" - mspConfigPath: peerOrganizations/org1/users/Admin@org1/msp - tlsRootCertPath: peerOrganizations/org1/peers/peer0-org1-network1/tls/ca.crt - artifactory: - url: https://na.artifactory.swg-devops.com/artifactory - path: res-dlt-interop-generic-local/fabric-test-environment/sacc.zip - secret: artifactory-apikey - secretKey: apikey diff --git a/weaver/tests/network-setups/test/fabric/charts/fnimcc.yaml b/weaver/tests/network-setups/test/fabric/charts/fnimcc.yaml deleted file mode 100644 index dd0010ccf7..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/fnimcc.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - chaincode: - name: fnimcc - version: v1.0 - lang: golang - git: 'https://github.ibm.com/dlt-interoperability/proof-verification.git' - branch: 'external-interop-1.0' - subPath: ./fnimcc/ - imageRegistry: image-registry.openshift-image-registry.svc:5000/dlt-interop - imageName: fnimcc - imageTag: latest - initFn: "init" - initArgs: "" - endorsementPolicy: "AND('Org1MSP')" - artifactory: - path: res-dlt-interop-generic-local/proof-verification/fnimcc_fabric_external-interop-1.0.zip diff --git a/weaver/tests/network-setups/test/fabric/charts/snamcc.yaml b/weaver/tests/network-setups/test/fabric/charts/snamcc.yaml deleted file mode 100644 index 326bd471cf..0000000000 --- a/weaver/tests/network-setups/test/fabric/charts/snamcc.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -network: - chaincode: - name: snamcc - version: v1.0 - lang: golang - git: 'https://github.ibm.com/dlt-interoperability/proof-generation.git' - branch: external-interop-1.0 - subPath: ./snamcc/ - imageRegistry: image-registry.openshift-image-registry.svc:5000/dlt-interop - imageName: snamcc - imageTag: latest - initFn: "init" - initArgs: "\"fnimcc\"" - endorsementPolicy: "AND('Org1MSP')" - artifactory: - path: res-dlt-interop-generic-local/proof-generation/snamcc_fabric_external-interop-1.0.zip diff --git a/weaver/tests/network-setups/test/fabric/copy-builder.sh b/weaver/tests/network-setups/test/fabric/copy-builder.sh deleted file mode 100644 index 863b66e94a..0000000000 --- a/weaver/tests/network-setups/test/fabric/copy-builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -POD=$(kubectl get pod -l app=fabric-cli -o jsonpath="{.items[0].metadata.name}") -echo ${POD} -kubectl cp external-service-builder ${POD}:/var/pvc1/external-service-builder diff --git a/weaver/tests/network-setups/test/fabric/external-service-builder/bin/build b/weaver/tests/network-setups/test/fabric/external-service-builder/bin/build deleted file mode 100755 index 34fd785328..0000000000 --- a/weaver/tests/network-setups/test/fabric/external-service-builder/bin/build +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -SOURCE=$1 -OUTPUT=$3 - -#external chaincodes expect connection.json file in the chaincode package -if [ ! -f "$SOURCE/connection.json" ]; then - >&2 echo "$SOURCE/connection.json not found" - exit 1 -fi - -#simply copy the endpoint information to specified output location -echo "Build Started..." -cp $SOURCE/connection.json $OUTPUT/connection.json - -if [ -d "$SOURCE/metadata" ]; then - cp -a $SOURCE/metadata $OUTPUT/metadata -fi - -exit 0 diff --git a/weaver/tests/network-setups/test/fabric/external-service-builder/bin/detect b/weaver/tests/network-setups/test/fabric/external-service-builder/bin/detect deleted file mode 100755 index 50abc87d2e..0000000000 --- a/weaver/tests/network-setups/test/fabric/external-service-builder/bin/detect +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -METADIR=$2 -#check if the "type" field is set to "external" -echo "Inside External Builder: Detect" -if [ "$(jq -r .type "$METADIR/metadata.json")" == "external" ]; then - echo "Using External Builder" - exit 0 -fi -echo "Inside External Builder: Detect: Failed. Going to regular chaincode installation..." -exit 1 diff --git a/weaver/tests/network-setups/test/fabric/external-service-builder/bin/release b/weaver/tests/network-setups/test/fabric/external-service-builder/bin/release deleted file mode 100755 index 5bddac9d59..0000000000 --- a/weaver/tests/network-setups/test/fabric/external-service-builder/bin/release +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -BLD="$1" -RELEASE="$2" - -if [ -d "$BLD/metadata" ]; then - cp -a "$BLD/metadata/"* "$RELEASE/" -fi - -echo "Chaincode installed." - -#external chaincodes expect artifacts to be placed under "$RELEASE"/chaincode/server -if [ -f $BLD/connection.json ]; then - mkdir -p "$RELEASE"/chaincode/server - cp $BLD/connection.json "$RELEASE"/chaincode/server - - #if tls_required is true, copy TLS files (using above example, the fully qualified path for these fils would be "$RELEASE"/chaincode/server/tls) - - exit 0 -fi - -exit 1 diff --git a/weaver/tests/network-setups/test/fabric/k8s/ca-dep.yaml b/weaver/tests/network-setups/test/fabric/k8s/ca-dep.yaml deleted file mode 100644 index 71c4f9e6b5..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/ca-dep.yaml +++ /dev/null @@ -1,141 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ca-orderer-network1 -spec: - replicas: 1 - selector: - matchLabels: - name: ca-orderer-network1 - template: - metadata: - labels: - name: ca-orderer-network1 - app: ca-orderer-network1 - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: ca-orderer-network1 - image: hyperledger/fabric-ca:1.4 - command: ["sh", "-c", "fabric-ca-server start -b admin:adminpw -d"] - ports: - - containerPort: 7054 - env: - - name: FABRIC_CA_HOME - value: /etc/hyperledger/fabric-ca-server - - name: FABRIC_CA_SERVER_CA_NAME - value: ca-orderer-network1 - - name: FABRIC_CA_SERVER_TLS_ENABLED - value: "true" - - name: FABRIC_CA_SERVER_PORT - value: "7054" - - name: FABRIC_CA_SERVER_CSR_CN - value: ca-orderer-network1 - - name: FABRIC_CA_SERVER_CSR_HOSTS - value: ca-orderer-network1 - - name: FABRIC_CA_SERVER_DB_TYPE - value: postgres - - name: FABRIC_CA_SERVER_DB_DATASOURCE - value: 'host=postgresql-network1 port=5432 user=pgadmin password=pgadminpw dbname=fabric_ca_network1 sslmode=disable' - volumeMounts: - - name: network1-secrets - subPath: fabric-ca/orderer - mountPath: /etc/hyperledger/fabric-ca-server - - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ca-org1-network1 -spec: - replicas: 1 - selector: - matchLabels: - name: ca-org1-network1 - template: - metadata: - labels: - name: ca-org1-network1 - app: ca-org1-network1 - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: ca-org1-network1 - image: hyperledger/fabric-ca:1.4 - command: ["sh", "-c", "fabric-ca-server start -b admin:adminpw -d"] - ports: - - containerPort: 7054 - env: - - name: FABRIC_CA_HOME - value: /etc/hyperledger/fabric-ca-server - - name: FABRIC_CA_SERVER_CA_NAME - value: ca-org1-network1 - - name: FABRIC_CA_SERVER_TLS_ENABLED - value: "true" - - name: FABRIC_CA_SERVER_PORT - value: "7054" - - name: FABRIC_CA_SERVER_CSR_CN - value: ca-org1-network1 - - name: FABRIC_CA_SERVER_CSR_HOSTS - value: ca-org1-network1 - - name: FABRIC_CA_SERVER_DB_TYPE - value: postgres - - name: FABRIC_CA_SERVER_DB_DATASOURCE - value: 'host=postgresql-network1-headless port=5432 user=pgadmin password=pgadminpw dbname=fabric_ca_network1 sslmode=disable' - volumeMounts: - - name: network1-secrets - subPath: fabric-ca/org1 - mountPath: /etc/hyperledger/fabric-ca-server - -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: ca-org2-network1 -# spec: -# replicas: 1 -# selector: -# matchLabels: -# name: ca-org2-network1 -# template: -# metadata: -# labels: -# name: ca-org2-network1 -# app: ca-org2-network1 -# spec: -# # volumes: -# # - name: network1-secrets -# # persistentVolumeClaim: -# # claimName: network1-secrets -# containers: -# - name: ca-org2-network1 -# image: hyperledger/fabric-ca:1.4 -# command: ["sh", "-c", "fabric-ca-server start -b admin:adminpw -d"] -# ports: -# - containerPort: 7054 -# env: -# - name: FABRIC_CA_HOME -# value: /etc/hyperledger/fabric-ca-server -# - name: FABRIC_CA_SERVER_CA_NAME -# value: ca-org2-network1 -# - name: FABRIC_CA_SERVER_TLS_ENABLED -# value: "true" -# - name: FABRIC_CA_SERVER_PORT -# value: "7054" -# - name: FABRIC_CA_SERVER_CSR_CN -# value: ca-org2-network1 -# - name: FABRIC_CA_SERVER_CSR_HOSTS -# value: ca-org2-network1 diff --git a/weaver/tests/network-setups/test/fabric/k8s/ca-route.yaml b/weaver/tests/network-setups/test/fabric/k8s/ca-route.yaml deleted file mode 100644 index 7e9534a438..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/ca-route.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Route -metadata: - name: ca-orderer-network1-route -spec: - host: ca-orderer-network1.dlt-interop.apps.ros2.sl.cloud9.ibm.com - port: - targetPort: grpc - to: - kind: Service - name: ca-orderer-network1 - tls: - termination: passthrough - wildcardPolicy: None ---- -apiVersion: v1 -kind: Route -metadata: - name: ca-org1-network1-route -spec: - host: ca-org1-network1.dlt-interop.apps.ros2.sl.cloud9.ibm.com - port: - targetPort: grpc - to: - kind: Service - name: ca-org1-network1 - tls: - termination: passthrough - wildcardPolicy: None diff --git a/weaver/tests/network-setups/test/fabric/k8s/ca-svc.yaml b/weaver/tests/network-setups/test/fabric/k8s/ca-svc.yaml deleted file mode 100644 index 91bec02585..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/ca-svc.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Service -metadata: - name: ca-orderer-network1 - labels: - run: ca-orderer-network1 -spec: - type: ClusterIP - selector: - name: ca-orderer-network1 - ports: - - protocol: TCP - port: 7054 - name: grpc ---- -apiVersion: v1 -kind: Service -metadata: - name: ca-org1-network1 - labels: - run: ca-org1-network1 -spec: - type: ClusterIP - selector: - name: ca-org1-network1 - ports: - - protocol: TCP - port: 7054 - name: grpc -# --- -# apiVersion: v1 -# kind: Service -# metadata: -# name: ca-org2-network1 -# labels: -# run: ca-org2-network1 -# spec: -# type: ClusterIP -# selector: -# name: ca-org2-network1 -# ports: -# - protocol: TCP -# port: 7054 -# name: grpc diff --git a/weaver/tests/network-setups/test/fabric/k8s/fabric-cli.yaml b/weaver/tests/network-setups/test/fabric/k8s/fabric-cli.yaml deleted file mode 100644 index 53a756913d..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/fabric-cli.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: fabric-cli -spec: - replicas: 1 - selector: - matchLabels: - name: fabric-cli - template: - metadata: - labels: - name: fabric-cli - app: fabric-cli - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: fabric-cli - image: hyperledger/fabric-tools:2.2 - command: ["sh", "-c", "sleep 3600"] - env: - - name: FABRIC_CFG_PATH - value: /var/pvc1 - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 diff --git a/weaver/tests/network-setups/test/fabric/k8s/job-create-channel.yaml b/weaver/tests/network-setups/test/fabric/k8s/job-create-channel.yaml deleted file mode 100644 index 04a0ef9300..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/job-create-channel.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: batch/v1 -kind: Job -metadata: - name: create-channel -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: create-channel - image: hyperledger/fabric-tools:2.1 - env: - - name: CHANNEL_NAME - value: mychannel - - name: CORE_PEER_LOCALMSPID - value: Org1MSP - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: /var/pvc1/peerOrganizations/org1/peers/peer0-org1-network1/tls/ca.crt - - name: CORE_PEER_MSPCONFIGPATH - value: /var/pvc1/peerOrganizations/org1/users/Admin@org1/msp - - name: CORE_PEER_ADDRESS - value: peer0-org1-network1:7051 - - name: CHANNELTX - value: /var/pvc1/channel-artifacts - - name: ORDERER_NAME - value: ord0-orderers-network1 - - name: ORDERER_URL - value: ord0-orderers-network1:7050 - - name: ORDERER_CA - value: /var/pvc1/ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/ca.crt - - name: CORE_PEER_TLS_ENABLED - value: "true" - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['cd /var/pvc1; - peer channel create -o ${ORDERER_URL} -c $CHANNEL_NAME -f ${CHANNELTX}/${CHANNEL_NAME}.tx --tls --cafile ${ORDERER_CA};'] - restartPolicy: Never - backoffLimit: 4 diff --git a/weaver/tests/network-setups/test/fabric/k8s/job-gen-artifacts.yaml b/weaver/tests/network-setups/test/fabric/k8s/job-gen-artifacts.yaml deleted file mode 100644 index 5d96c31257..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/job-gen-artifacts.yaml +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: batch/v1 -kind: Job -metadata: - name: gen-artifacts -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - - name: configtx - configMap: - name: network1-configtx - containers: - - name: gen-artifacts - image: hyperledger/fabric-tools:2.1 - env: - - name: CHANNEL_NAME - value: mychannel - - name: ORGMSPS - value: "Org1MSP" - - name: ORDERER_PROFILE - value: OneOrgOrdererGenesis - - name: CHANNEL_PROFILE - value: OneOrgChannel - - name: FABRIC_CFG_PATH - value: /var/pvc1 - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - - name: configtx - mountPath: /var/fabric_cfg - command: ["/bin/sh", "-c"] - args: ['mkdir -p /var/pvc1/system-genesis-block; - cp /var/fabric_cfg/configtx.yaml /var/pvc1/; - set -x; - configtxgen -profile ${ORDERER_PROFILE} -channelID system-channel -outputBlock /var/pvc1/system-genesis-block/genesis.block; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to generate orderer genesis block..."; - exit 1; - fi; - - mkdir -p /var/pvc1/channel-artifacts; - echo "Generating channel-artifacts"; - set -x; - configtxgen -profile ${CHANNEL_PROFILE} -outputCreateChannelTx /var/pvc1/channel-artifacts/${CHANNEL_NAME}.tx -channelID $CHANNEL_NAME; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to generate channel configuration transaction..."; - exit 1; - fi; - - for orgmsp in $ORGMSPS; do - echo "####### Generating anchor peer update for ${orgmsp} ##########"; - set -x; - configtxgen -profile ${CHANNEL_PROFILE} -outputAnchorPeersUpdate /var/pvc1/channel-artifacts/${orgmsp}anchors.tx -channelID $CHANNEL_NAME -asOrg ${orgmsp}; - res=$?; - set +x; - if [ $res -ne 0 ]; then - echo "Failed to generate anchor peer update for ${orgmsp}..."; - exit 1; - fi; - echo; - done;'] - restartPolicy: Never - backoffLimit: 4 diff --git a/weaver/tests/network-setups/test/fabric/k8s/job-gen-crypto-ord.yaml b/weaver/tests/network-setups/test/fabric/k8s/job-gen-crypto-ord.yaml deleted file mode 100644 index 6716f14c8f..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/job-gen-crypto-ord.yaml +++ /dev/null @@ -1,110 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: batch/v1 -kind: Job -metadata: - name: gen-crypto-ord -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: gen-crypto-ord - image: hyperledger/fabric-ca:1.4 - env: - - name: DOMAIN - value: orderer - - name: NODE_HOSTNAME - value: ord0-orderers-network1 - - name: CA_NAME - value: ca-orderer-network1 - - name: CA_URL - value: ca-orderer-network1:7054 - - name: CA_CERT_FILE - value: ca-orderer-network1-7054-ca-orderer-network1.pem - - name: FABRIC_CA_CLIENT_HOME - value: /var/pvc1/ordererOrganizations/orderer - - name: TLS_CACERT_PATH - value: /var/pvc1/fabric-ca/orderer/tls-cert.pem - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['echo; - echo "Enroll the CA admin"; - echo; - mkdir -p ${FABRIC_CA_CLIENT_HOME}; - - export FABRIC_CA_CLIENT_HOME=${FABRIC_CA_CLIENT_HOME}; - set -x; - fabric-ca-client enroll -u https://admin:adminpw@${CA_URL} --caname ${CA_NAME} --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - echo "NodeOUs:\n Enable: true\n ClientOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: client\n PeerOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: peer\n AdminOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: admin\n OrdererOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: orderer" > ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml; - - - echo; - echo "Register orderer"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name orderer --id.secret ordererpw --id.type orderer --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - echo; - echo "Register the orderer admin"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name ordererAdmin --id.secret ordererAdminpw --id.type admin --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers/${DOMAIN}; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}; - - echo; - echo "## Generate the orderer msp"; - echo; - set -x; - fabric-ca-client enroll -u https://orderer:ordererpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp --csr.hosts ${NODE_HOSTNAME} --csr.hosts localhost --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp/config.yaml; - - echo; - echo "## Generate the orderer-tls certificates"; - echo; - set -x; - fabric-ca-client enroll -u https://orderer:ordererpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls --enrollment.profile tls --csr.hosts ${NODE_HOSTNAME} --csr.hosts localhost --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/ca.crt; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/signcerts/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/server.crt; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/keystore/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/server.key; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp/tlscacerts; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/msp/tlscacerts/tlsca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts; - cp ${FABRIC_CA_CLIENT_HOME}/orderers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts/tlsca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}; - - echo; - echo "## Generate the admin msp"; - echo; - set -x; - fabric-ca-client enroll -u https://ordererAdmin:ordererAdminpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp/config.yaml;'] - restartPolicy: Never - backoffLimit: 4 diff --git a/weaver/tests/network-setups/test/fabric/k8s/job-gen-crypto-org1.yaml b/weaver/tests/network-setups/test/fabric/k8s/job-gen-crypto-org1.yaml deleted file mode 100644 index a3790da603..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/job-gen-crypto-org1.yaml +++ /dev/null @@ -1,130 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: batch/v1 -kind: Job -metadata: - name: gen-crypto-org1 -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: gen-crypto-org1 - image: hyperledger/fabric-ca:1.4 - env: - - name: DOMAIN - value: org1 - - name: NODE_HOSTNAME - value: peer0-org1-network1 - - name: CA_NAME - value: ca-org1-network1 - - name: CA_URL - value: ca-org1-network1:7054 - - name: CA_CERT_FILE - value: ca-org1-network1-7054-ca-org1-network1.pem - - name: FABRIC_CA_CLIENT_HOME - value: /var/pvc1/peerOrganizations/org1 - - name: TLS_CACERT_PATH - value: /var/pvc1/fabric-ca/org1/tls-cert.pem - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['echo; - echo "Enroll the CA admin"; - echo; - mkdir -p ${FABRIC_CA_CLIENT_HOME}; - - export FABRIC_CA_CLIENT_HOME=${FABRIC_CA_CLIENT_HOME}/; - - set -x; - fabric-ca-client enroll -u https://admin:adminpw@${CA_URL} --caname ${CA_NAME} --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - echo "NodeOUs:\n Enable: true\n ClientOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: client\n PeerOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: peer\n AdminOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: admin\n OrdererOUIdentifier:\n Certificate: cacerts/${CA_CERT_FILE}\n OrganizationalUnitIdentifier: orderer" > ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml; - - echo; - echo "Register peer0"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name peer0 --id.secret peer0pw --id.type peer --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - echo; - echo "Register user"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name user1 --id.secret user1pw --id.type client --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - echo; - echo "Register the org admin"; - echo; - set -x; - fabric-ca-client register --caname ${CA_NAME} --id.name org1admin --id.secret org1adminpw --id.type admin --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/peers; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}; - - echo; - echo "## Generate the peer0 msp"; - echo; - set -x; - fabric-ca-client enroll -u https://peer0:peer0pw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/msp --csr.hosts ${NODE_HOSTNAME} --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/msp/config.yaml; - - echo; - echo "## Generate the peer0-tls certificates"; - echo; - set -x; - fabric-ca-client enroll -u https://peer0:peer0pw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls --enrollment.profile tls --csr.hosts ${NODE_HOSTNAME} --csr.hosts localhost --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/ca.crt; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/signcerts/* ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/server.crt; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/keystore/* ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/server.key; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/msp/tlscacerts/ca.crt; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/tlsca; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/tls/tlscacerts/* ${FABRIC_CA_CLIENT_HOME}/tlsca/tlsca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/ca; - cp ${FABRIC_CA_CLIENT_HOME}/peers/${NODE_HOSTNAME}/msp/cacerts/* ${FABRIC_CA_CLIENT_HOME}/ca/ca.${DOMAIN}-cert.pem; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users; - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users/User1@${DOMAIN}; - - echo; - echo "## Generate the user msp"; - echo; - set -x; - fabric-ca-client enroll -u https://user1:user1pw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/users/User1@${DOMAIN}/msp --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/users/User1@${DOMAIN}/msp/config.yaml; - - mkdir -p ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}; - - echo; - echo "## Generate the org admin msp"; - echo; - set -x; - fabric-ca-client enroll -u https://org1admin:org1adminpw@${CA_URL} --caname ${CA_NAME} -M ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp --tls.certfiles ${TLS_CACERT_PATH}; - set +x; - - cp ${FABRIC_CA_CLIENT_HOME}/msp/config.yaml ${FABRIC_CA_CLIENT_HOME}/users/Admin@${DOMAIN}/msp/config.yaml;'] - restartPolicy: Never - backoffLimit: 4 diff --git a/weaver/tests/network-setups/test/fabric/k8s/job-join-channel.yaml b/weaver/tests/network-setups/test/fabric/k8s/job-join-channel.yaml deleted file mode 100644 index 071c93805b..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/job-join-channel.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: batch/v1 -kind: Job -metadata: - name: join-channel -spec: - template: - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: join-channel - image: hyperledger/fabric-tools:2.1 - env: - - name: CHANNEL_NAME - value: mychannel - - name: CORE_PEER_LOCALMSPID - value: Org1MSP - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: /var/pvc1/peerOrganizations/org1/peers/peer0-org1-network1/tls/ca.crt - - name: CORE_PEER_MSPCONFIGPATH - value: /var/pvc1/peerOrganizations/org1/users/Admin@org1/msp - - name: CORE_PEER_ADDRESS - value: peer0-org1-network1:7051 - - name: CHANNELTX - value: /var/pvc1/channel-artifacts - - name: ORDERER_NAME - value: ord0-orderers-network1 - - name: ORDERER_URL - value: ord0-orderers-network1:7050 - - name: ORDERER_CA - value: /var/pvc1/ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/ca.crt - - name: CORE_PEER_TLS_ENABLED - value: "true" - volumeMounts: - - name: network1-secrets - mountPath: /var/pvc1 - command: ["/bin/sh", "-c"] - args: ['cd /var/pvc1; - peer channel join -b /var/pvc1/${CHANNEL_NAME}.block; - peer channel update -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} -c $CHANNEL_NAME -f ${CHANNELTX}/${CORE_PEER_LOCALMSPID}anchors.tx --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA;'] - restartPolicy: Never - backoffLimit: 4 diff --git a/weaver/tests/network-setups/test/fabric/k8s/ord-dep.yaml b/weaver/tests/network-setups/test/fabric/k8s/ord-dep.yaml deleted file mode 100644 index 1e61c77a76..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/ord-dep.yaml +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ord0-orderers-network1 -spec: - replicas: 1 - selector: - matchLabels: - name: ord0-orderers-network1 - template: - metadata: - labels: - name: ord0-orderers-network1 - app: ord0-orderers-network1 - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - containers: - - name: orderers - image: hyperledger/fabric-orderer:2.1 - command: ["sh", "-c", "orderer"] - ports: - - containerPort: 7050 - env: - - name: FABRIC_LOGGING_SPEC - value: INFO - - name: FABRIC_CFG_PATH - value: /etc/hyperledger/fabric - - name: ORDERER_GENERAL_LISTENADDRESS - value: 0.0.0.0 - - name: ORDERER_GENERAL_LISTENPORT - value: "7050" - - name: ORDERER_GENERAL_GENESISMETHOD - value: file - - name: ORDERER_GENERAL_GENESISFILE - value: /fabric/system-genesis-block/genesis.block - - name: ORDERER_GENERAL_LOCALMSPID - value: OrdererMSP - - name: ORDERER_GENERAL_LOCALMSPDIR - value: /fabric/orderer/msp - - name: ORDERER_GENERAL_TLS_ENABLED - value: "true" - - name: ORDERER_GENERAL_TLS_PRIVATEKEY - value: /fabric/orderer/tls/server.key - - name: ORDERER_GENERAL_TLS_CERTIFICATE - value: /fabric/orderer/tls/server.crt - - name: ORDERER_GENERAL_TLS_ROOTCAS - value: /fabric/orderer/tls/ca.crt - - name: ORDERER_KAFKA_TOPIC_REPLICATIONFACTOR - value: "1" - - name: ORDERER_KAFKA_VERBOSE - value: "true" - - name: ORDERER_GENERAL_CLUSTER_CLIENTCERTIFICATE - value: /fabric/orderer/tls/server.crt - - name: ORDERER_GENERAL_CLUSTER_CLIENTPRIVATEKEY - value: /fabric/orderer/tls/server.key - - name: ORDERER_GENERAL_CLUSTER_ROOTCAS - value: /fabric/orderer/tls/ca.crt - volumeMounts: - - name: network1-secrets - subPath: ordererOrganizations/orderer/orderers/ord0-orderers-network1 - mountPath: /fabric/orderer - - name: network1-secrets - subPath: system-genesis-block - mountPath: /fabric/system-genesis-block diff --git a/weaver/tests/network-setups/test/fabric/k8s/ord-svc.yaml b/weaver/tests/network-setups/test/fabric/k8s/ord-svc.yaml deleted file mode 100644 index 89aaadfa54..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/ord-svc.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Service -metadata: - name: ord0-orderers-network1 - labels: - run: ord0-orderers-network1 -spec: - type: ClusterIP - selector: - name: ord0-orderers-network1 - ports: - - protocol: TCP - port: 7050 - name: grpc diff --git a/weaver/tests/network-setups/test/fabric/k8s/peer-dep.yaml b/weaver/tests/network-setups/test/fabric/k8s/peer-dep.yaml deleted file mode 100644 index 1ed33024e2..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/peer-dep.yaml +++ /dev/null @@ -1,192 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: apps/v1 -kind: Deployment -metadata: - name: peer0-org1-network1 -spec: - replicas: 1 - selector: - matchLabels: - name: peer0-org1-network1 - template: - metadata: - labels: - name: peer0-org1-network1 - app: peer0-org1-network1 - spec: - volumes: - - name: network1-secrets - persistentVolumeClaim: - claimName: network1-secrets - - name: external-builder - configMap: - name: external-builder - defaultMode: 0777 - - name: peer-config - configMap: - name: peer-config - containers: - - name: peers - image: hyperledger/fabric-peer:2.1 - command: ["sh", "-c", "apk add --no-cache bash jq; - peer node start"] - ports: - - containerPort: 7051 - - containerPort: 7052 - - containerPort: 7053 - env: - - name: FABRIC_LOGGING_SPEC - value: INFO - - name: FABRIC_CFG_PATH - value: /etc/hyperledger/fabric - - name: CORE_PEER_ID - value: peer0-org1-network1 - - name: CORE_PEER_ADDRESS - value: peer0-org1-network1:7051 - - name: CORE_PEER_LISTENADDRESS - value: 0.0.0.0:7051 - - name: CORE_PEER_CHAINCODEADDRESS - value: peer0-org1-network1:7052 - - name: CORE_PEER_CHAINCODELISTENADDRESS - value: 0.0.0.0:7052 - - name: CORE_PEER_GOSSIP_BOOTSTRAP - value: peer0-org1-network1:7051 - - name: CORE_PEER_GOSSIP_ENDPOINT - value: peer0-org1-network1:7051 - - name: CORE_PEER_GOSSIP_EXTERNALENDPOINT - value: peer0-org1-network1:7051 - - name: CORE_PEER_GOSSIP_ORGLEADER - value: "false" - - name: CORE_PEER_GOSSIP_USELEADERELECTION - value: "true" - - name: CORE_PEER_PROFILE_ENABLED - value: "true" - - name: CORE_PEER_LOCALMSPID - value: Org1MSP - - name: CORE_PEER_MSPCONFIGPATH - value: /fabric/peer/msp - - name: CORE_PEER_TLS_ENABLED - value: "true" - - name: CORE_PEER_PROFILE_ENABLED - value: "true" - - name: CORE_PEER_TLS_KEY_FILE - value: /fabric/peer/tls/server.key - - name: CORE_PEER_TLS_CERT_FILE - value: /fabric/peer/tls/server.crt - - name: CORE_PEER_TLS_ROOTCERT_FILE - value: /fabric/peer/tls/ca.crt - - name: CORE_LEDGER_STATE_DATABASE - value: "CouchDB" - - name: CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS - value: "localhost:5984" - - name: ORDERER_URL - value: ord0-orderers-network1:7050 - volumeMounts: - - name: network1-secrets - subPath: peerOrganizations/org1/peers/peer0-org1-network1 - mountPath: /fabric/peer - - name: network1-secrets - mountPath: /fabric/network1-secrets - - name: external-builder - mountPath: /fabric/external-service-builder/bin - - name: peer-config - mountPath: /etc/hyperledger/fabric - - name: couchdb - image: hyperledger/fabric-couchdb - ports: - - containerPort: 5984 - -# --- -# apiVersion: apps/v1 -# kind: Deployment -# metadata: -# name: peer0-org2-network1 -# spec: -# replicas: 1 -# selector: -# matchLabels: -# name: peer0-org2-network1 -# template: -# metadata: -# labels: -# name: peer0-org2-network1 -# app: peer0-org2-network1 -# spec: -# volumes: -# - name: network1-secrets -# persistentVolumeClaim: -# claimName: network1-secrets -# containers: -# - name: peers -# image: hyperledger/fabric-peer:2.1 -# command: ["sh", "-c", "peer node start"] -# ports: -# - containerPort: 7051 -# - containerPort: 7052 -# - containerPort: 7061 -# env: -# - name: CORE_VM_ENDPOINT -# value: unix:///host/var/run/docker.sock -# - name: FABRIC_LOGGING_SPEC -# value: INFO -# - name: FABRIC_CFG_PATH -# value: /etc/hyperledger/fabric -# - name: CORE_PEER_ID -# value: peer0-org2-network1 -# - name: CORE_PEER_ADDRESS -# value: peer0-org2-network1:7051 -# - name: CORE_PEER_LISTENADDRESS -# value: 0.0.0.0:7051 -# - name: CORE_PEER_EVENTS_ADDRESS -# value: 0.0.0.0:7061 -# - name: CORE_PEER_CHAINCODEADDRESS -# value: peer0-org2-network1:7052 -# - name: CORE_PEER_CHAINCODELISTENADDRESS -# value: 0.0.0.0:7052 -# - name: CORE_PEER_GOSSIP_BOOTSTRAP -# value: peer0-org2-network1:7051 -# - name: CORE_PEER_GOSSIP_ENDPOINT -# value: peer0-org2-network1:7051 -# - name: CORE_PEER_GOSSIP_EXTERNALENDPOINT -# value: peer0-org2-network1:7051 -# - name: CORE_PEER_GOSSIP_ORGLEADER -# value: "false" -# - name: CORE_PEER_GOSSIP_USELEADERELECTION -# value: "true" -# - name: CORE_PEER_PROFILE_ENABLED -# value: "true" -# - name: CORE_PEER_LOCALMSPID -# value: Org2MSP -# - name: CORE_PEER_MSPCONFIGPATH -# value: /fabric/peer/msp -# - name: CORE_PEER_TLS_ENABLED -# value: "true" -# - name: CORE_PEER_PROFILE_ENABLED -# value: "true" -# - name: CORE_PEER_TLS_KEY_FILE -# value: /fabric/peer/tls/server.key -# - name: CORE_PEER_TLS_CERT_FILE -# value: /fabric/peer/tls/server.crt -# - name: CORE_PEER_TLS_ROOTCERT_FILE -# value: /fabric/peer/tls/ca.crt -# - name: CORE_LEDGER_STATE_DATABASE -# value: "CouchDB" -# - name: CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS -# value: "localhost:5984" -# - name: ORDERER_URL -# value: ord0-orderers-network1:7050 -# volumeMounts: -# - name: network1-secrets -# subPath: peerOrganizations/org2/peers/peer0-org2-network1 -# mountPath: /fabric/peer -# - name: network1-secrets -# mountPath: /fabric/network1-secrets -# - name: couchdb -# image: hyperledger/fabric-couchdb -# ports: -# - containerPort: 5984 diff --git a/weaver/tests/network-setups/test/fabric/k8s/peer-svc.yaml b/weaver/tests/network-setups/test/fabric/k8s/peer-svc.yaml deleted file mode 100644 index 455b301e16..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/peer-svc.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Service -metadata: - name: peer0-org1-network1 - labels: - run: peer0-org1-network1 -spec: - type: ClusterIP - selector: - name: peer0-org1-network1 - ports: - - protocol: TCP - port: 7051 - name: grpc - - protocol: TCP - port: 7053 - name: events - - protocol: TCP - port: 5984 - name: couchdb - -# --- -# apiVersion: v1 -# kind: Service -# metadata: -# name: peer0-org2-network1 -# labels: -# run: peer0-org2-network1 -# spec: -# type: ClusterIP -# selector: -# name: peer0-org2-network1 -# ports: -# - protocol: TCP -# port: 7051 -# name: grpc -# - protocol: TCP -# port: 7061 -# name: events -# - protocol: TCP -# port: 5984 -# name: couchdb diff --git a/weaver/tests/network-setups/test/fabric/k8s/postgres-secret.yaml b/weaver/tests/network-setups/test/fabric/k8s/postgres-secret.yaml deleted file mode 100644 index a72e18fcb7..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/postgres-secret.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Secret -metadata: - name: postgresql-network1 - annotations: - app.kubernetes.io/component: "CA DB" - labels: - app: postgresql -type: Opaque -data: - postgresql-password: "cGdhZG1pbnB3" diff --git a/weaver/tests/network-setups/test/fabric/k8s/postgres-service.yaml b/weaver/tests/network-setups/test/fabric/k8s/postgres-service.yaml deleted file mode 100644 index e0de4296e1..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/postgres-service.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Service -metadata: - name: postgresql-network1 - annotations: - app.kubernetes.io/component: "CA DB" - labels: - app: postgresql-network1 -spec: - type: ClusterIP - ports: - - name: tcp-postgresql - port: 5432 - targetPort: tcp-postgresql - selector: - app: postgresql-network1 - role: main ---- -apiVersion: v1 -kind: Service -metadata: - name: postgresql-network1-headless - annotations: - app.kubernetes.io/component: "CA DB" - labels: - app: postgresql-network1 -spec: - type: ClusterIP - clusterIP: None - ports: - - name: tcp-postgresql - port: 5432 - targetPort: tcp-postgresql - selector: - app: postgresql-network1 diff --git a/weaver/tests/network-setups/test/fabric/k8s/postgres-statefulset.yaml b/weaver/tests/network-setups/test/fabric/k8s/postgres-statefulset.yaml deleted file mode 100644 index 0ae89e101f..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/postgres-statefulset.yaml +++ /dev/null @@ -1,106 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: postgresql-network1 - annotations: - app.kubernetes.io/component: "CA DB" - labels: - app: postgresql-network1 -spec: - serviceName: postgresql-network1-headless - replicas: 1 - updateStrategy: - type: RollingUpdate - selector: - matchLabels: - app: postgresql-network1 - role: main - template: - metadata: - name: postgresql-network1 - labels: - app: postgresql-network1 - role: main - spec: - containers: - - name: postgresql-network1 - image: docker.io/bitnami/postgresql:11.7.0-debian-10-r26 - imagePullPolicy: "IfNotPresent" - resources: - requests: - cpu: 200m - memory: 256Mi - env: - - name: BITNAMI_DEBUG - value: "false" - - name: POSTGRESQL_PORT_NUMBER - value: "5432" - - name: POSTGRESQL_VOLUME_DIR - value: "/bitnami/postgresql" - - name: PGDATA - value: "/bitnami/postgresql/data" - - name: POSTGRES_USER - value: pgadmin - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: postgresql-network1 - key: postgresql-password - - name: POSTGRES_DB - value: "fabric_ca" - - name: POSTGRESQL_ENABLE_LDAP - value: "no" - ports: - - name: tcp-postgresql - containerPort: 5432 - livenessProbe: - exec: - command: - - /bin/sh - - -c - - exec pg_isready -U "pgadmin" -d fabric_ca -h 127.0.0.1 -p 5432 - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 6 - readinessProbe: - exec: - command: - - /bin/sh - - -c - - -e - - | - exec pg_isready -U "pgadmin" -d fabric_ca -h 127.0.0.1 -p 5432 - [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ] - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 6 - volumeMounts: - - name: dshm - mountPath: /dev/shm - - name: postgresql-network1-data - mountPath: /bitnami/postgresql - subPath: - volumes: - - name: dshm - emptyDir: - medium: Memory - sizeLimit: 1Gi - volumeClaimTemplates: - - metadata: - name: postgresql-network1-data - spec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: "500Mi" diff --git a/weaver/tests/network-setups/test/fabric/k8s/pvc-network1-secrets.yaml b/weaver/tests/network-setups/test/fabric/k8s/pvc-network1-secrets.yaml deleted file mode 100644 index 48c59a56ca..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/pvc-network1-secrets.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: network1-secrets -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 100Mi - storageClassName: nfs-storage - volumeMode: Filesystem diff --git a/weaver/tests/network-setups/test/fabric/k8s/secret-artifactory-apikey.yaml b/weaver/tests/network-setups/test/fabric/k8s/secret-artifactory-apikey.yaml deleted file mode 100644 index b7537d51d2..0000000000 --- a/weaver/tests/network-setups/test/fabric/k8s/secret-artifactory-apikey.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -apiVersion: v1 -kind: Secret -metadata: - name: artifactory-apikey - annotations: - app.kubernetes.io/component: "ARTIFACTORY APIKEY" - labels: - app: artifactory-apikey -type: Opaque -data: - apikey: QUtDcDVlM3AySjFIakxuUkpLdUFiZjg0ZW96TUJCQVc0Q3JUdmo2cnU3M29pUlNnUkcyb3NTblIyemE2bWM1NG1HbkZ3TlR6cA== diff --git a/weaver/tests/network-setups/test/fabric/network1/configtx.yaml b/weaver/tests/network-setups/test/fabric/network1/configtx.yaml deleted file mode 100644 index 0c1276a8ad..0000000000 --- a/weaver/tests/network-setups/test/fabric/network1/configtx.yaml +++ /dev/null @@ -1,358 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - ---- -################################################################################ -# -# Section: Organizations -# -# - This section defines the different organizational identities which will -# be referenced later in the configuration. -# -################################################################################ -Organizations: - - # SampleOrg defines an MSP using the sampleconfig. It should never be used - # in production but may be used as a template for other definitions - - &OrdererOrg - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: OrdererOrg - - # ID to load the MSP definition as - ID: OrdererMSP - - # MSPDir is the filesystem path which contains the MSP configuration - MSPDir: ./ordererOrganizations/orderer/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Writers: - Type: Signature - Rule: "OR('OrdererMSP.member')" - Admins: - Type: Signature - Rule: "OR('OrdererMSP.admin')" - - OrdererEndpoints: - - ord0-orderers-network1:7050 - - - &Org1 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org1MSP - - # ID to load the MSP definition as - ID: Org1MSP - - MSPDir: ./peerOrganizations/org1/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org1MSP.admin', 'Org1MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org1MSP.admin')" - Endorsement: - Type: Signature - Rule: "OR('Org1MSP.peer')" - - # leave this flag set to true. - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0-org1-network1 - Port: 7051 - - - &Org2 - # DefaultOrg defines the organization which is used in the sampleconfig - # of the fabric.git development environment - Name: Org2MSP - - # ID to load the MSP definition as - ID: Org2MSP - - MSPDir: ./peerOrganizations/org2/msp - - # Policies defines the set of policies at this level of the config tree - # For organization policies, their canonical path is usually - # /Channel/// - Policies: - Readers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.peer', 'Org2MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org2MSP.admin', 'Org2MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org2MSP.admin')" - Endorsement: - Type: Signature - Rule: "OR('Org2MSP.peer')" - - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0-org2-network1 - Port: 7051 - -################################################################################ -# -# SECTION: Capabilities -# -# - This section defines the capabilities of fabric network. This is a new -# concept as of v1.1.0 and should not be utilized in mixed networks with -# v1.0.x peers and orderers. Capabilities define features which must be -# present in a fabric binary for that binary to safely participate in the -# fabric network. For instance, if a new MSP type is added, newer binaries -# might recognize and validate the signatures from this type, while older -# binaries without this support would be unable to validate those -# transactions. This could lead to different versions of the fabric binaries -# having different world states. Instead, defining a capability for a channel -# informs those binaries without this capability that they must cease -# processing transactions until they have been upgraded. For v1.0.x if any -# capabilities are defined (including a map with all capabilities turned off) -# then the v1.0.x peer will deliberately crash. -# -################################################################################ -Capabilities: - # Channel capabilities apply to both the orderers and the peers and must be - # supported by both. - # Set the value of the capability to true to require it. - Channel: &ChannelCapabilities - # V2_0 capability ensures that orderers and peers behave according - # to v2.0 channel capabilities. Orderers and peers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 capability. - # Prior to enabling V2.0 channel capabilities, ensure that all - # orderers and peers on a channel are at v2.0.0 or later. - V2_0: true - - # Orderer capabilities apply only to the orderers, and may be safely - # used with prior release peers. - # Set the value of the capability to true to require it. - Orderer: &OrdererCapabilities - # V2_0 orderer capability ensures that orderers behave according - # to v2.0 orderer capabilities. Orderers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 orderer capability. - # Prior to enabling V2.0 orderer capabilities, ensure that all - # orderers on channel are at v2.0.0 or later. - V2_0: true - - # Application capabilities apply only to the peer network, and may be safely - # used with prior release orderers. - # Set the value of the capability to true to require it. - Application: &ApplicationCapabilities - # V2_0 application capability ensures that peers behave according - # to v2.0 application capabilities. Peers from - # prior releases would behave in an incompatible way, and are therefore - # not able to participate in channels at v2.0 application capability. - # Prior to enabling V2.0 application capabilities, ensure that all - # peers on channel are at v2.0.0 or later. - V2_0: true - -################################################################################ -# -# SECTION: Application -# -# - This section defines the values to encode into a config transaction or -# genesis block for application related parameters -# -################################################################################ -Application: &ApplicationDefaults - - # Organizations is the list of orgs which are defined as participants on - # the application side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Application policies, their canonical path is - # /Channel/Application/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - LifecycleEndorsement: - Type: ImplicitMeta - Rule: "MAJORITY Endorsement" - Endorsement: - Type: ImplicitMeta - Rule: "MAJORITY Endorsement" - - Capabilities: - <<: *ApplicationCapabilities -################################################################################ -# -# SECTION: Orderer -# -# - This section defines the values to encode into a config transaction or -# genesis block for orderer related parameters -# -################################################################################ -Orderer: &OrdererDefaults - - # Orderer Type: The orderer implementation to start - OrdererType: etcdraft - - EtcdRaft: - Consenters: - - Host: ord0-orderers-network1 - Port: 7050 - ClientTLSCert: ./ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/server.crt - ServerTLSCert: ./ordererOrganizations/orderer/orderers/ord0-orderers-network1/tls/server.crt - - Addresses: - - ord0-orderers-network1:7050 - - # Batch Timeout: The amount of time to wait before creating a batch - BatchTimeout: 2s - - # Batch Size: Controls the number of messages batched into a block - BatchSize: - - # Max Message Count: The maximum number of messages to permit in a batch - MaxMessageCount: 10 - - # Absolute Max Bytes: The absolute maximum number of bytes allowed for - # the serialized messages in a batch. - AbsoluteMaxBytes: 99 MB - - # Preferred Max Bytes: The preferred maximum number of bytes allowed for - # the serialized messages in a batch. A message larger than the preferred - # max bytes will result in a batch larger than preferred max bytes. - PreferredMaxBytes: 512 KB - - # Organizations is the list of orgs which are defined as participants on - # the orderer side of the network - Organizations: - - # Policies defines the set of policies at this level of the config tree - # For Orderer policies, their canonical path is - # /Channel/Orderer/ - Policies: - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - # BlockValidation specifies what signatures must be included in the block - # from the orderer for the peer to validate it. - BlockValidation: - Type: ImplicitMeta - Rule: "ANY Writers" - -################################################################################ -# -# CHANNEL -# -# This section defines the values to encode into a config transaction or -# genesis block for channel related parameters. -# -################################################################################ -Channel: &ChannelDefaults - # Policies defines the set of policies at this level of the config tree - # For Channel policies, their canonical path is - # /Channel/ - Policies: - # Who may invoke the 'Deliver' API - Readers: - Type: ImplicitMeta - Rule: "ANY Readers" - # Who may invoke the 'Broadcast' API - Writers: - Type: ImplicitMeta - Rule: "ANY Writers" - # By default, who may modify elements at this config level - Admins: - Type: ImplicitMeta - Rule: "MAJORITY Admins" - - # Capabilities describes the channel level capabilities, see the - # dedicated Capabilities section elsewhere in this file for a full - # description - Capabilities: - <<: *ChannelCapabilities - -################################################################################ -# -# Profile -# -# - Different configuration profiles may be encoded here to be specified -# as parameters to the configtxgen tool -# -################################################################################ -Profiles: - - OneOrgOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - OneOrgChannel: - Consortium: SampleConsortium - <<: *ChannelDefaults - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - Capabilities: - <<: *ApplicationCapabilities - - TwoOrgsOrdererGenesis: - <<: *ChannelDefaults - Orderer: - <<: *OrdererDefaults - Organizations: - - *OrdererOrg - Capabilities: - <<: *OrdererCapabilities - Consortiums: - SampleConsortium: - Organizations: - - *Org1 - - *Org2 - TwoOrgsChannel: - Consortium: SampleConsortium - <<: *ChannelDefaults - Application: - <<: *ApplicationDefaults - Organizations: - - *Org1 - - *Org2 - Capabilities: - <<: *ApplicationCapabilities diff --git a/weaver/tests/network-setups/test/fabric/peer-config/core.yaml b/weaver/tests/network-setups/test/fabric/peer-config/core.yaml deleted file mode 100644 index fd6cc5a55b..0000000000 --- a/weaver/tests/network-setups/test/fabric/peer-config/core.yaml +++ /dev/null @@ -1,727 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################### -# -# Peer section -# -############################################################################### -peer: - - # The peer id provides a name for this peer instance and is used when - # naming docker resources. - id: jdoe - - # The networkId allows for logical separation of networks and is used when - # naming docker resources. - networkId: dev - - # The Address at local network interface this Peer will listen on. - # By default, it will listen on all network interfaces - listenAddress: 0.0.0.0:7051 - - # The endpoint this peer uses to listen for inbound chaincode connections. - # If this is commented-out, the listen address is selected to be - # the peer's address (see below) with port 7052 - # chaincodeListenAddress: 0.0.0.0:7052 - - # The endpoint the chaincode for this peer uses to connect to the peer. - # If this is not specified, the chaincodeListenAddress address is selected. - # And if chaincodeListenAddress is not specified, address is selected from - # peer listenAddress. - # chaincodeAddress: 0.0.0.0:7052 - - # When used as peer config, this represents the endpoint to other peers - # in the same organization. For peers in other organization, see - # gossip.externalEndpoint for more info. - # When used as CLI config, this means the peer's endpoint to interact with - address: 0.0.0.0:7051 - - # Whether the Peer should programmatically determine its address - # This case is useful for docker containers. - addressAutoDetect: false - - # Keepalive settings for peer server and clients - keepalive: - # Interval is the duration after which if the server does not see - # any activity from the client it pings the client to see if it's alive - interval: 7200s - # Timeout is the duration the server waits for a response - # from the client after sending a ping before closing the connection - timeout: 20s - # MinInterval is the minimum permitted time between client pings. - # If clients send pings more frequently, the peer server will - # disconnect them - minInterval: 60s - # Client keepalive settings for communicating with other peer nodes - client: - # Interval is the time between pings to peer nodes. This must - # greater than or equal to the minInterval specified by peer - # nodes - interval: 60s - # Timeout is the duration the client waits for a response from - # peer nodes before closing the connection - timeout: 20s - # DeliveryClient keepalive settings for communication with ordering - # nodes. - deliveryClient: - # Interval is the time between pings to ordering nodes. This must - # greater than or equal to the minInterval specified by ordering - # nodes. - interval: 60s - # Timeout is the duration the client waits for a response from - # ordering nodes before closing the connection - timeout: 20s - - - # Gossip related configuration - gossip: - # Bootstrap set to initialize gossip with. - # This is a list of other peers that this peer reaches out to at startup. - # Important: The endpoints here have to be endpoints of peers in the same - # organization, because the peer would refuse connecting to these endpoints - # unless they are in the same organization as the peer. - bootstrap: 127.0.0.1:7051 - - # NOTE: orgLeader and useLeaderElection parameters are mutual exclusive. - # Setting both to true would result in the termination of the peer - # since this is undefined state. If the peers are configured with - # useLeaderElection=false, make sure there is at least 1 peer in the - # organization that its orgLeader is set to true. - - # Defines whenever peer will initialize dynamic algorithm for - # "leader" selection, where leader is the peer to establish - # connection with ordering service and use delivery protocol - # to pull ledger blocks from ordering service. It is recommended to - # use leader election for large networks of peers. - useLeaderElection: true - # Statically defines peer to be an organization "leader", - # where this means that current peer will maintain connection - # with ordering service and disseminate block across peers in - # its own organization - orgLeader: false - - # Interval for membershipTracker polling - membershipTrackerInterval: 5s - - # Overrides the endpoint that the peer publishes to peers - # in its organization. For peers in foreign organizations - # see 'externalEndpoint' - endpoint: - # Maximum count of blocks stored in memory - maxBlockCountToStore: 100 - # Max time between consecutive message pushes(unit: millisecond) - maxPropagationBurstLatency: 10ms - # Max number of messages stored until a push is triggered to remote peers - maxPropagationBurstSize: 10 - # Number of times a message is pushed to remote peers - propagateIterations: 1 - # Number of peers selected to push messages to - propagatePeerNum: 3 - # Determines frequency of pull phases(unit: second) - # Must be greater than digestWaitTime + responseWaitTime - pullInterval: 4s - # Number of peers to pull from - pullPeerNum: 3 - # Determines frequency of pulling state info messages from peers(unit: second) - requestStateInfoInterval: 4s - # Determines frequency of pushing state info messages to peers(unit: second) - publishStateInfoInterval: 4s - # Maximum time a stateInfo message is kept until expired - stateInfoRetentionInterval: - # Time from startup certificates are included in Alive messages(unit: second) - publishCertPeriod: 10s - # Should we skip verifying block messages or not (currently not in use) - skipBlockVerification: false - # Dial timeout(unit: second) - dialTimeout: 3s - # Connection timeout(unit: second) - connTimeout: 2s - # Buffer size of received messages - recvBuffSize: 20 - # Buffer size of sending messages - sendBuffSize: 200 - # Time to wait before pull engine processes incoming digests (unit: second) - # Should be slightly smaller than requestWaitTime - digestWaitTime: 1s - # Time to wait before pull engine removes incoming nonce (unit: milliseconds) - # Should be slightly bigger than digestWaitTime - requestWaitTime: 1500ms - # Time to wait before pull engine ends pull (unit: second) - responseWaitTime: 2s - # Alive check interval(unit: second) - aliveTimeInterval: 5s - # Alive expiration timeout(unit: second) - aliveExpirationTimeout: 25s - # Reconnect interval(unit: second) - reconnectInterval: 25s - # This is an endpoint that is published to peers outside of the organization. - # If this isn't set, the peer will not be known to other organizations. - externalEndpoint: - # Leader election service configuration - election: - # Longest time peer waits for stable membership during leader election startup (unit: second) - startupGracePeriod: 15s - # Interval gossip membership samples to check its stability (unit: second) - membershipSampleInterval: 1s - # Time passes since last declaration message before peer decides to perform leader election (unit: second) - leaderAliveThreshold: 10s - # Time between peer sends propose message and declares itself as a leader (sends declaration message) (unit: second) - leaderElectionDuration: 5s - - pvtData: - # pullRetryThreshold determines the maximum duration of time private data corresponding for a given block - # would be attempted to be pulled from peers until the block would be committed without the private data - pullRetryThreshold: 60s - # As private data enters the transient store, it is associated with the peer's ledger's height at that time. - # transientstoreMaxBlockRetention defines the maximum difference between the current ledger's height upon commit, - # and the private data residing inside the transient store that is guaranteed not to be purged. - # Private data is purged from the transient store when blocks with sequences that are multiples - # of transientstoreMaxBlockRetention are committed. - transientstoreMaxBlockRetention: 1000 - # pushAckTimeout is the maximum time to wait for an acknowledgement from each peer - # at private data push at endorsement time. - pushAckTimeout: 3s - # Block to live pulling margin, used as a buffer - # to prevent peer from trying to pull private data - # from peers that is soon to be purged in next N blocks. - # This helps a newly joined peer catch up to current - # blockchain height quicker. - btlPullMargin: 10 - # the process of reconciliation is done in an endless loop, while in each iteration reconciler tries to - # pull from the other peers the most recent missing blocks with a maximum batch size limitation. - # reconcileBatchSize determines the maximum batch size of missing private data that will be reconciled in a - # single iteration. - reconcileBatchSize: 10 - # reconcileSleepInterval determines the time reconciler sleeps from end of an iteration until the beginning - # of the next reconciliation iteration. - reconcileSleepInterval: 1m - # reconciliationEnabled is a flag that indicates whether private data reconciliation is enable or not. - reconciliationEnabled: true - # skipPullingInvalidTransactionsDuringCommit is a flag that indicates whether pulling of invalid - # transaction's private data from other peers need to be skipped during the commit time and pulled - # only through reconciler. - skipPullingInvalidTransactionsDuringCommit: false - # implicitCollectionDisseminationPolicy specifies the dissemination policy for the peer's own implicit collection. - # When a peer endorses a proposal that writes to its own implicit collection, below values override the default values - # for disseminating private data. - # Note that it is applicable to all channels the peer has joined. The implication is that requiredPeerCount has to - # be smaller than the number of peers in a channel that has the lowest numbers of peers from the organization. - implicitCollectionDisseminationPolicy: - # requiredPeerCount defines the minimum number of eligible peers to which the peer must successfully - # disseminate private data for its own implicit collection during endorsement. Default value is 0. - requiredPeerCount: 0 - # maxPeerCount defines the maximum number of eligible peers to which the peer will attempt to - # disseminate private data for its own implicit collection during endorsement. Default value is 1. - maxPeerCount: 1 - - # Gossip state transfer related configuration - state: - # indicates whenever state transfer is enabled or not - # default value is true, i.e. state transfer is active - # and takes care to sync up missing blocks allowing - # lagging peer to catch up to speed with rest network - enabled: true - # checkInterval interval to check whether peer is lagging behind enough to - # request blocks via state transfer from another peer. - checkInterval: 10s - # responseTimeout amount of time to wait for state transfer response from - # other peers - responseTimeout: 3s - # batchSize the number of blocks to request via state transfer from another peer - batchSize: 10 - # blockBufferSize reflects the size of the re-ordering buffer - # which captures blocks and takes care to deliver them in order - # down to the ledger layer. The actually buffer size is bounded between - # 0 and 2*blockBufferSize, each channel maintains its own buffer - blockBufferSize: 100 - # maxRetries maximum number of re-tries to ask - # for single state transfer request - maxRetries: 3 - - # TLS Settings - tls: - # Require server-side TLS - enabled: false - # Require client certificates / mutual TLS. - # Note that clients that are not configured to use a certificate will - # fail to connect to the peer. - clientAuthRequired: false - # X.509 certificate used for TLS server - cert: - file: tls/server.crt - # Private key used for TLS server (and client if clientAuthEnabled - # is set to true - key: - file: tls/server.key - # Trusted root certificate chain for tls.cert - rootcert: - file: tls/ca.crt - # Set of root certificate authorities used to verify client certificates - clientRootCAs: - files: - - tls/ca.crt - # Private key used for TLS when making client connections. If - # not set, peer.tls.key.file will be used instead - clientKey: - file: - # X.509 certificate used for TLS when making client connections. - # If not set, peer.tls.cert.file will be used instead - clientCert: - file: - - # Authentication contains configuration parameters related to authenticating - # client messages - authentication: - # the acceptable difference between the current server time and the - # client's time as specified in a client request message - timewindow: 15m - - # Path on the file system where peer will store data (eg ledger). This - # location must be access control protected to prevent unintended - # modification that might corrupt the peer operations. - fileSystemPath: /var/hyperledger/production - - # BCCSP (Blockchain crypto provider): Select which crypto implementation or - # library to use - BCCSP: - Default: SW - # Settings for the SW crypto provider (i.e. when DEFAULT: SW) - SW: - # TODO: The default Hash and Security level needs refactoring to be - # fully configurable. Changing these defaults requires coordination - # SHA2 is hardcoded in several places, not only BCCSP - Hash: SHA2 - Security: 256 - # Location of Key Store - FileKeyStore: - # If "", defaults to 'mspConfigPath'/keystore - KeyStore: - # Settings for the PKCS#11 crypto provider (i.e. when DEFAULT: PKCS11) - PKCS11: - # Location of the PKCS11 module library - Library: - # Token Label - Label: - # User PIN - Pin: - Hash: - Security: - - # Path on the file system where peer will find MSP local configurations - mspConfigPath: msp - - # Identifier of the local MSP - # ----!!!!IMPORTANT!!!-!!!IMPORTANT!!!-!!!IMPORTANT!!!!---- - # Deployers need to change the value of the localMspId string. - # In particular, the name of the local MSP ID of a peer needs - # to match the name of one of the MSPs in each of the channel - # that this peer is a member of. Otherwise this peer's messages - # will not be identified as valid by other nodes. - localMspId: SampleOrg - - # CLI common client config options - client: - # connection timeout - connTimeout: 3s - - # Delivery service related config - deliveryclient: - # It sets the total time the delivery service may spend in reconnection - # attempts until its retry logic gives up and returns an error - reconnectTotalTimeThreshold: 3600s - - # It sets the delivery service <-> ordering service node connection timeout - connTimeout: 3s - - # It sets the delivery service maximal delay between consecutive retries - reConnectBackoffThreshold: 3600s - - # A list of orderer endpoint addresses which should be overridden - # when found in channel configurations. - addressOverrides: - # - from: - # to: - # caCertsFile: - # - from: - # to: - # caCertsFile: - - # Type for the local MSP - by default it's of type bccsp - localMspType: bccsp - - # Used with Go profiling tools only in none production environment. In - # production, it should be disabled (eg enabled: false) - profile: - enabled: false - listenAddress: 0.0.0.0:6060 - - # Handlers defines custom handlers that can filter and mutate - # objects passing within the peer, such as: - # Auth filter - reject or forward proposals from clients - # Decorators - append or mutate the chaincode input passed to the chaincode - # Endorsers - Custom signing over proposal response payload and its mutation - # Valid handler definition contains: - # - A name which is a factory method name defined in - # core/handlers/library/library.go for statically compiled handlers - # - library path to shared object binary for pluggable filters - # Auth filters and decorators are chained and executed in the order that - # they are defined. For example: - # authFilters: - # - - # name: FilterOne - # library: /opt/lib/filter.so - # - - # name: FilterTwo - # decorators: - # - - # name: DecoratorOne - # - - # name: DecoratorTwo - # library: /opt/lib/decorator.so - # Endorsers are configured as a map that its keys are the endorsement system chaincodes that are being overridden. - # Below is an example that overrides the default ESCC and uses an endorsement plugin that has the same functionality - # as the default ESCC. - # If the 'library' property is missing, the name is used as the constructor method in the builtin library similar - # to auth filters and decorators. - # endorsers: - # escc: - # name: DefaultESCC - # library: /etc/hyperledger/fabric/plugin/escc.so - handlers: - authFilters: - - - name: DefaultAuth - - - name: ExpirationCheck # This filter checks identity x509 certificate expiration - decorators: - - - name: DefaultDecorator - endorsers: - escc: - name: DefaultEndorsement - library: - validators: - vscc: - name: DefaultValidation - library: - - # library: /etc/hyperledger/fabric/plugin/escc.so - # Number of goroutines that will execute transaction validation in parallel. - # By default, the peer chooses the number of CPUs on the machine. Set this - # variable to override that choice. - # NOTE: overriding this value might negatively influence the performance of - # the peer so please change this value only if you know what you're doing - validatorPoolSize: - - # The discovery service is used by clients to query information about peers, - # such as - which peers have joined a certain channel, what is the latest - # channel config, and most importantly - given a chaincode and a channel, - # what possible sets of peers satisfy the endorsement policy. - discovery: - enabled: true - # Whether the authentication cache is enabled or not. - authCacheEnabled: true - # The maximum size of the cache, after which a purge takes place - authCacheMaxSize: 1000 - # The proportion (0 to 1) of entries that remain in the cache after the cache is purged due to overpopulation - authCachePurgeRetentionRatio: 0.75 - # Whether to allow non-admins to perform non channel scoped queries. - # When this is false, it means that only peer admins can perform non channel scoped queries. - orgMembersAllowedAccess: false - - # Limits is used to configure some internal resource limits. - limits: - # Concurrency limits the number of concurrently running requests to a service on each peer. - # Currently this option is only applied to endorser service and deliver service. - # When the property is missing or the value is 0, the concurrency limit is disabled for the service. - concurrency: - # endorserService limits concurrent requests to endorser service that handles chaincode deployment, query and invocation, - # including both user chaincodes and system chaincodes. - endorserService: 2500 - # deliverService limits concurrent event listeners registered to deliver service for blocks and transaction events. - deliverService: 2500 - -############################################################################### -# -# VM section -# -############################################################################### -vm: - - # Endpoint of the vm management system. For docker can be one of the following in general - # unix:///var/run/docker.sock - # http://localhost:2375 - # https://localhost:2376 - endpoint: unix:///var/run/docker.sock - - # settings for docker vms - docker: - tls: - enabled: false - ca: - file: docker/ca.crt - cert: - file: docker/tls.crt - key: - file: docker/tls.key - - # Enables/disables the standard out/err from chaincode containers for - # debugging purposes - attachStdout: false - - # Parameters on creating docker container. - # Container may be efficiently created using ipam & dns-server for cluster - # NetworkMode - sets the networking mode for the container. Supported - # standard values are: `host`(default),`bridge`,`ipvlan`,`none`. - # Dns - a list of DNS servers for the container to use. - # Note: `Privileged` `Binds` `Links` and `PortBindings` properties of - # Docker Host Config are not supported and will not be used if set. - # LogConfig - sets the logging driver (Type) and related options - # (Config) for Docker. For more info, - # https://docs.docker.com/engine/admin/logging/overview/ - # Note: Set LogConfig using Environment Variables is not supported. - hostConfig: - NetworkMode: host - Dns: - # - 192.168.0.1 - LogConfig: - Type: json-file - Config: - max-size: "50m" - max-file: "5" - Memory: 2147483648 - -############################################################################### -# -# Chaincode section -# -############################################################################### -chaincode: - - # The id is used by the Chaincode stub to register the executing Chaincode - # ID with the Peer and is generally supplied through ENV variables - # the `path` form of ID is provided when installing the chaincode. - # The `name` is used for all other requests and can be any string. - id: - path: - name: - - # Generic builder environment, suitable for most chaincode types - builder: $(DOCKER_NS)/fabric-ccenv:$(TWO_DIGIT_VERSION) - - # Enables/disables force pulling of the base docker images (listed below) - # during user chaincode instantiation. - # Useful when using moving image tags (such as :latest) - pull: false - - golang: - # golang will never need more than baseos - runtime: $(DOCKER_NS)/fabric-baseos:$(TWO_DIGIT_VERSION) - - # whether or not golang chaincode should be linked dynamically - dynamicLink: false - - java: - # This is an image based on java:openjdk-8 with addition compiler - # tools added for java shim layer packaging. - # This image is packed with shim layer libraries that are necessary - # for Java chaincode runtime. - runtime: $(DOCKER_NS)/fabric-javaenv:$(TWO_DIGIT_VERSION) - - node: - # This is an image based on node:$(NODE_VER)-alpine - runtime: $(DOCKER_NS)/fabric-nodeenv:$(TWO_DIGIT_VERSION) - - # List of directories to treat as external builders and launchers for - # chaincode. The external builder detection processing will iterate over the - # builders in the order specified below. - externalBuilders: - - path: /fabric/external-service-builder - name: external-service-builder - propagateEnvironment: - - GOPROXY - - GONOPROXY - - GOSUMDB - - GONOSUMDB - - # The maximum duration to wait for the chaincode build and install process - # to complete. - installTimeout: 300s - - # Timeout duration for starting up a container and waiting for Register - # to come through. - startuptimeout: 300s - - # Timeout duration for Invoke and Init calls to prevent runaway. - # This timeout is used by all chaincodes in all the channels, including - # system chaincodes. - # Note that during Invoke, if the image is not available (e.g. being - # cleaned up when in development environment), the peer will automatically - # build the image, which might take more time. In production environment, - # the chaincode image is unlikely to be deleted, so the timeout could be - # reduced accordingly. - executetimeout: 30s - - # There are 2 modes: "dev" and "net". - # In dev mode, user runs the chaincode after starting peer from - # command line on local machine. - # In net mode, peer will run chaincode in a docker container. - mode: net - - # keepalive in seconds. In situations where the communication goes through a - # proxy that does not support keep-alive, this parameter will maintain connection - # between peer and chaincode. - # A value <= 0 turns keepalive off - keepalive: 0 - - # enabled system chaincodes. - system: - _lifecycle: enable - cscc: enable - lscc: enable - escc: enable - vscc: enable - qscc: enable - - # Logging section for the chaincode container - logging: - # Default level for all loggers within the chaincode container - level: info - # Override default level for the 'shim' logger - shim: warning - # Format for the chaincode container logs - format: '%{color}%{time:2006-01-02 15:04:05.000 MST} [%{module}] %{shortfunc} -> %{level:.4s} %{id:03x}%{color:reset} %{message}' - -############################################################################### -# -# Ledger section - ledger configuration encompasses both the blockchain -# and the state -# -############################################################################### -ledger: - - blockchain: - - state: - # stateDatabase - options are "goleveldb", "CouchDB" - # goleveldb - default state database stored in goleveldb. - # CouchDB - store state database in CouchDB - stateDatabase: goleveldb - # Limit on the number of records to return per query - totalQueryLimit: 100000 - couchDBConfig: - # It is recommended to run CouchDB on the same server as the peer, and - # not map the CouchDB container port to a server port in docker-compose. - # Otherwise proper security must be provided on the connection between - # CouchDB client (on the peer) and server. - couchDBAddress: 127.0.0.1:5984 - # This username must have read and write authority on CouchDB - username: - # The password is recommended to pass as an environment variable - # during start up (eg CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD). - # If it is stored here, the file must be access control protected - # to prevent unintended users from discovering the password. - password: - # Number of retries for CouchDB errors - maxRetries: 3 - # Number of retries for CouchDB errors during peer startup - maxRetriesOnStartup: 12 - # CouchDB request timeout (unit: duration, e.g. 20s) - requestTimeout: 35s - # Limit on the number of records per each CouchDB query - # Note that chaincode queries are only bound by totalQueryLimit. - # Internally the chaincode may execute multiple CouchDB queries, - # each of size internalQueryLimit. - internalQueryLimit: 1000 - # Limit on the number of records per CouchDB bulk update batch - maxBatchUpdateSize: 1000 - # Warm indexes after every N blocks. - # This option warms any indexes that have been - # deployed to CouchDB after every N blocks. - # A value of 1 will warm indexes after every block commit, - # to ensure fast selector queries. - # Increasing the value may improve write efficiency of peer and CouchDB, - # but may degrade query response time. - warmIndexesAfterNBlocks: 1 - # Create the _global_changes system database - # This is optional. Creating the global changes database will require - # additional system resources to track changes and maintain the database - createGlobalChangesDB: false - # CacheSize denotes the maximum mega bytes (MB) to be allocated for the in-memory state - # cache. Note that CacheSize needs to be a multiple of 32 MB. If it is not a multiple - # of 32 MB, the peer would round the size to the next multiple of 32 MB. - # To disable the cache, 0 MB needs to be assigned to the cacheSize. - cacheSize: 64 - - history: - # enableHistoryDatabase - options are true or false - # Indicates if the history of key updates should be stored. - # All history 'index' will be stored in goleveldb, regardless if using - # CouchDB or alternate database for the state. - enableHistoryDatabase: true - - pvtdataStore: - # the maximum db batch size for converting - # the ineligible missing data entries to eligible missing data entries - collElgProcMaxDbBatchSize: 5000 - # the minimum duration (in milliseconds) between writing - # two consecutive db batches for converting the ineligible missing data entries to eligible missing data entries - collElgProcDbBatchesInterval: 1000 - -############################################################################### -# -# Operations section -# -############################################################################### -operations: - # host and port for the operations server - listenAddress: 127.0.0.1:9443 - - # TLS configuration for the operations endpoint - tls: - # TLS enabled - enabled: false - - # path to PEM encoded server certificate for the operations server - cert: - file: - - # path to PEM encoded server key for the operations server - key: - file: - - # most operations service endpoints require client authentication when TLS - # is enabled. clientAuthRequired requires client certificate authentication - # at the TLS layer to access all resources. - clientAuthRequired: false - - # paths to PEM encoded ca certificates to trust for client authentication - clientRootCAs: - files: [] - -############################################################################### -# -# Metrics section -# -############################################################################### -metrics: - # metrics provider is one of statsd, prometheus, or disabled - provider: disabled - - # statsd configuration - statsd: - # network type: tcp or udp - network: udp - - # statsd server address - address: 127.0.0.1:8125 - - # the interval at which locally cached counters and gauges are pushed - # to statsd; timings are pushed immediately - writeInterval: 10s - - # prefix is prepended to all emitted statsd metrics - prefix: diff --git a/weaver/tests/network-setups/test/fabric/scripts/initCC.sh b/weaver/tests/network-setups/test/fabric/scripts/initCC.sh deleted file mode 100755 index d01906d52a..0000000000 --- a/weaver/tests/network-setups/test/fabric/scripts/initCC.sh +++ /dev/null @@ -1,254 +0,0 @@ -#!/bin/bash - -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -INIT_REQUIRED="--init-required" -if [ "$CC_INIT_FCN" = "NA" ]; then - INIT_REQUIRED="" -fi - -if [ "$CC_END_POLICY" = "NA" ]; then - CC_END_POLICY="" -else - CC_END_POLICY="--signature-policy $CC_END_POLICY" -fi - -if [ "$CC_COLL_CONFIG" = "NA" ]; then - CC_COLL_CONFIG="" -else - CC_COLL_CONFIG="--collections-config $CC_COLL_CONFIG" -fi - -setGlobals() { - local USING_ORG="" - ORG=$1 - ORGMSP=`echo ${ORG:0:1} | tr '[a-z]' '[A-Z]'`${ORG:1}"MSP" - echo "Using organization ${ORG}, MSP: ${ORGMSP}" - export CORE_PEER_LOCALMSPID=${ORGMSP} - export CORE_PEER_TLS_ROOTCERT_FILE=/var/pvc1/peerOrganizations/${ORG}/peers/peer0-${ORG}-${NW_NAME}/tls/ca.crt - export CORE_PEER_MSPCONFIGPATH=/var/pvc1/peerOrganizations/${ORG}/users/Admin@${ORG}/msp - export CORE_PEER_ADDRESS=peer0-${ORG}-${NW_NAME}:${PORT} - - if [ "$VERBOSE" == "true" ]; then - env | grep CORE - fi -} - -# parsePeerConnectionParameters $@ -# Helper function that sets the peer connection parameters for a chaincode -# operation -parsePeerConnectionParameters() { - PEER_CONN_PARAMS="" - for org in $ORG_LIST; do - PEER_CONN_PARAMS=$PEER_CONN_PARAMS" --peerAddresses peer0-${org}-${NW_NAME}:${PORT} --tlsRootCertFiles /var/pvc1/peerOrganizations/${org}/peers/peer0-${org}-${NW_NAME}/tls/ca.crt" - done -} - -verifyResult() { - if [ $1 -ne 0 ]; then - echo "############# $2 .##########" - echo - exit 1 - fi -} - -# queryInstalled PEER ORG -queryInstalled() { - ORG=$1 - setGlobals $ORG - set -x - peer lifecycle chaincode queryinstalled >&~/log.txt - res=$? - set +x - grep ${CC_NAME} ~/log.txt > logtemp.txt - cat logtemp.txt - # PACKAGE_ID=$(sed -n "/${CC_NAME}/{s/^Package ID: //; s/, Label:.*$//; p;}" logtemp.txt) - verifyResult $res "Query installed on ${CORE_PEER_ADDRESS} has failed" - echo PackageID is ${PACKAGE_ID} - echo "===================== Query installed successful on ${CORE_PEER_ADDRESS} on channel ===================== " - echo - rm logtemp.txt -} - -# approveForMyOrg VERSION PEER ORG -approveForMyOrg() { - ORG=$1 - setGlobals $ORG - set -x - peer lifecycle chaincode approveformyorg -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA --channelID $CHANNEL_NAME --name ${CC_NAME} --version ${CC_VERSION} --init-required --package-id ${PACKAGE_ID} --sequence ${CC_SEQUENCE} >&~/log.txt - set +x - cat ~/log.txt - verifyResult $res "Chaincode definition approved on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' failed" - echo "===================== Chaincode definition approved on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -# checkCommitReadiness VERSION PEER ORG -checkCommitReadiness() { - ORG=$1 - setGlobals $ORG - echo "===================== Checking the commit readiness of the chaincode definition on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME'... ===================== " - local rc=1 - local COUNTER=1 - # continue to poll - # we either get a successful response, or reach MAX RETRY - while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do - sleep $DELAY - echo "Attempting to check the commit readiness of the chaincode definition on ${CORE_PEER_ADDRESS}, Retry after $DELAY seconds." - set -x - peer lifecycle chaincode checkcommitreadiness --channelID ${CHANNEL_NAME} --name ${CC_NAME} --version ${CC_VERSION} --sequence ${CC_SEQUENCE} ${INIT_REQUIRED} ${CC_END_POLICY} ${CC_COLL_CONFIG} --output json >&~/log.txt - res=$? - set +x - let rc=0 - for var in "$@"; do - if [ "$var" != "$ORG" ]; then - echo 'var...'$var - grep "$var" ~/log.txt &>/dev/null || let rc=1 - fi - done - COUNTER=$(expr $COUNTER + 1) - done - cat ~/log.txt - if test $rc -eq 0; then - echo "===================== Checking the commit readiness of the chaincode definition successful on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - else - echo - echo $'\e[1;31m'"############### After $MAX_RETRY attempts, Check commit readiness result on ${CORE_PEER_ADDRESS} is INVALID ###############!"$'\e[0m' - echo - exit 1 - fi -} - -# commitChaincodeDefinition VERSION PEER ORG (PEER ORG)... -commitChaincodeDefinition() { - parsePeerConnectionParameters - res=$? - verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " - - # while 'peer chaincode' command can get the orderer endpoint from the - # peer (if join was successful), let's supply it directly as we know - # it using the "-o" option - - set -x - peer lifecycle chaincode commit -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA --channelID $CHANNEL_NAME --name ${CC_NAME} $PEER_CONN_PARAMS --version ${CC_VERSION} --sequence ${CC_SEQUENCE} ${INIT_REQUIRED} ${CC_END_POLICY} ${CC_COLL_CONFIG} >&~/log.txt - res=$? - set +x - cat ~/log.txt - verifyResult $res "Chaincode definition commit failed on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' failed" - echo "===================== Chaincode definition committed on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -# queryCommitted ORG -queryCommitted() { - ORG=$1 - setGlobals $ORG - EXPECTED_RESULT="Version: ${CC_VERSION}, Sequence: ${CC_SEQUENCE}, Endorsement Plugin: escc, Validation Plugin: vscc" - echo "===================== Querying chaincode definition on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME'... ===================== " - local rc=1 - local COUNTER=1 - # continue to poll - # we either get a successful response, or reach MAX RETRY - while [ $rc -ne 0 -a $COUNTER -lt $MAX_RETRY ]; do - sleep $DELAY - echo "Attempting to Query committed status on ${CORE_PEER_ADDRESS}, Retry after $DELAY seconds." - set -x - peer lifecycle chaincode querycommitted --channelID $CHANNEL_NAME --name ${CC_NAME} >&~/log.txt - res=$? - set +x - test $res -eq 0 && VALUE=$(cat ~/log.txt | grep -o '^Version: '$CC_VERSION', Sequence: [0-9], Endorsement Plugin: escc, Validation Plugin: vscc') - test "$VALUE" = "$EXPECTED_RESULT" && let rc=0 - COUNTER=$(expr $COUNTER + 1) - done - echo - cat ~/log.txt - if test $rc -eq 0; then - echo "===================== Query chaincode definition successful on ${CORE_PEER_ADDRESS} on channel '$CHANNEL_NAME' ===================== " - echo - else - echo "############### After $MAX_RETRY attempts, Query chaincode definition result on ${CORE_PEER_ADDRESS} is INVALID ###############!" - echo - exit 1 - fi - sleep 1 -} - -chaincodeInvokeInit() { - parsePeerConnectionParameters - res=$? - verifyResult $res "Invoke transaction failed on channel '$CHANNEL_NAME' due to uneven number of peer and org parameters " - - # while 'peer chaincode' command can get the orderer endpoint from the - # peer (if join was successful), let's supply it directly as we know - # it using the "-o" option - set -x - if [ "$CC_INIT_FCN" = "" ]; then - fcn_call='{"Args":['${CC_INIT_ARGS}']}' - else - fcn_call='{"function":"'${CC_INIT_FCN}'","Args":['${CC_INIT_ARGS}']}' - fi - - echo invoke fcn call:${fcn_call} - peer chaincode invoke -o ${ORDERER_URL} --ordererTLSHostnameOverride ${ORDERER_NAME} --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n ${CC_NAME} $PEER_CONN_PARAMS --isInit -c ${fcn_call} >&~/log.txt - res=$? - set +x - cat ~/log.txt - verifyResult $res "Invoke execution on PEERS failed " - echo "===================== Invoke transaction successful on PEERS on channel '$CHANNEL_NAME' ===================== " - echo - sleep 1 -} - -CC_PKG_FILE=${CC_NAME}.tar.gz - -for org in $ORG_LIST; do - set -x - nc -zv -w5 "${CC_NAME}-peer0-${org}-${NW_NAME}" 7052 - res=$? - set +x - verifyResult $res "Could not find chaincode server at ${CC_NAME}-peer0-${org}-${NW_NAME}:7052" -done - -echo "Chaincode Server Up, Running instantiation" - -## approve the definition -for org in $ORG_LIST; do - set -a - . /var/pvc1/chaincodes/${CC_NAME}-peer0-${org}-${NW_NAME}/pkgid - set +a - PACKAGE_ID=$CHAINCODE_CCID - queryInstalled ${org} - approveForMyOrg ${org} -done - -TMP_PARAMS="" -for org in $ORGMSPS; do - TMP_PARAMS=$TMP_PARAMS" \""$org"\": true" -done -echo 'PARAMS..'${TMP_PARAMS} -for org in $ORG_LIST; do - checkCommitReadiness ${org} ${TMP_PARAMS} -done - -## commit the definition -commitChaincodeDefinition - -## query on all orgs to see that the definition committed successfully -for org in $ORG_LIST; do - queryCommitted ${org} -done - -## Invoke the chaincode - this does require that the chaincode have the 'initLedger' -## method defined -if [ "$CC_INIT_FCN" = "NA" ]; then - echo "===================== Chaincode initialization is not required ===================== " - echo -else - chaincodeInvokeInit -fi - -exit 0 diff --git a/weaver/tests/network-setups/test/fabric/scripts/installCC.sh b/weaver/tests/network-setups/test/fabric/scripts/installCC.sh deleted file mode 100644 index 3806a3752f..0000000000 --- a/weaver/tests/network-setups/test/fabric/scripts/installCC.sh +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -apk add jq; - -########################## - -cd $GOPATH/src; -wget --header X-JFrog-Art-Api:$ARTIFACTORY_APIKEY $ARTIFACTORY_URL/$CC_PATH; -unzip $(basename $CC_PATH); -CC_PKG_FILE=${CC_NAME}.tar.gz; -CC_SRC_PATH=$GOPATH/src/$CC_NAME; -cp $CC_SRC_PATH/connection.json .; -cp $CC_SRC_PATH/metadata.json .; - -tmp=$(mktemp) -jq --arg a "$DEPLOYCC_NAME:7052" '.address = $a' connection.json > "$tmp" && mv "$tmp" connection.json -cat connection.json - -tar cfz code.tar.gz connection.json; -tar cfz ${CC_PKG_FILE} code.tar.gz metadata.json; -rm code.tar.gz metadata.json connection.json; -echo "===================== Chaincode is packaged on peer0.org${ORG} ===================== "; - -########################## - -echo; -set -x; -peer lifecycle chaincode install ${CC_PKG_FILE} >&~/log.txt; -res=$?; -set +x; -cat ~/log.txt -PACKAGE_ID=$(sed -n -e 's/^.*identifier: //p' ~/log.txt); -echo PackageID is $PACKAGE_ID -if [ $res -ne 0 ]; then - echo "############# Chaincode installation on ${CORE_PEER_ADDRESS} has failed ##########"; - exit 1; -fi; -echo "===================== Chaincode is installed on ${CORE_PEER_ADDRESS} ===================== "; - -########################## - -mkdir -p /var/pvc1/chaincodes/$DEPLOYCC_NAME; -echo "CHAINCODE_CCID="$PACKAGE_ID > /var/pvc1/chaincodes/$DEPLOYCC_NAME/pkgid; -echo "PACKAGE_ID: ${PACKAGE_ID} written to file ${DEPLOYCC_NAME}." -echo -exit 0