Skip to content

Commit ab19747

Browse files
committed
Improve diagrams style
Signed-off-by: Jakub Dzikowski <jakub.t.dzikowski@gmail.com>
1 parent a21c6f0 commit ab19747

10 files changed

+430
-255
lines changed

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -556,32 +556,46 @@ echo "Executing post-start hook"
556556
`;
557557
558558
exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-k8s.json.tmpdir/fablo-target/network-topology.mmd from samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = `
559-
"graph TD
559+
"graph LR
560560
561-
subgraph Org_Orderer [Org: Orderer]
562-
direction RL
563-
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
561+
classDef subgraph_padding fill:none,stroke:none
562+
563+
subgraph orderer_example_com [Organization: Orderer<br>orderer.example.com]
564+
subgraph orderer_example_com_padding [ ]
564565
direction RL
565-
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
566+
subgraph ord_group_group1_orderer0_group1_orderer_example_com [Orderer Group: group1<br>solo]
567+
subgraph ord_group_group1_orderer0_group1_orderer_example_com_padding [ ]
568+
direction RL
569+
orderer0_group1_orderer_example_com[orderer0.group1.orderer.example.com]
570+
end
571+
class ord_group_group1_orderer0_group1_orderer_example_com_padding subgraph_padding
572+
end
573+
ca_orderer_example_com([ca.orderer.example.com<br>sqlite])
566574
end
567-
CA_ca_Orderer{CA: ca_Orderer - sqlite}
575+
class orderer_example_com_padding subgraph_padding
568576
end
569577
570-
subgraph Org_Org1 [Org: Org1]
571-
direction RL
572-
CA_ca_Org1{CA: ca_Org1 - sqlite}
573-
Org1_peer0[Peer: peer0]
574-
Org1_peer1[Peer: peer1]
578+
subgraph org1_example_com [Organization: Org1<br>org1.example.com]
579+
subgraph org1_example_com_padding [ ]
580+
direction RL
581+
ca_org1_example_com([ca.org1.example.com<br>sqlite])
582+
peer0_org1_example_com[peer0.org1.example.com<br>LevelDb]
583+
peer1_org1_example_com[peer1.org1.example.com<br>LevelDb]
584+
end
585+
class org1_example_com_padding subgraph_padding
575586
end
576587
577-
subgraph Channel_my_channel1 [Channel: my-channel1]
578-
Chaincode_chaincode1[[Chaincode: chaincode1]]
588+
subgraph channel_my_channel1 [Channel: my-channel1]
589+
subgraph channel_my_channel1_padding [ ]
590+
chaincode_chaincode1[[Chaincode: chaincode1]]
591+
end
592+
class channel_my_channel1_padding subgraph_padding
579593
end
580594
581595
%% Connections
582-
Org1_peer0 --> Channel_my_channel1
583-
Org1_peer1 --> Channel_my_channel1
584-
Channel_my_channel1 --> OrdererGroup_group1"
596+
peer0_org1_example_com --> channel_my_channel1
597+
peer1_org1_example_com --> channel_my_channel1
598+
channel_my_channel1 --> ord_group_group1_orderer0_group1_orderer_example_com"
585599
`;
586600
587601
exports[`samples/fablo-config-hlf2-1org-1chaincode-k8s.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode-k8s.json 1`] = `

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3537,30 +3537,44 @@ echo "Executing post-start hook"
35373537
`;
35383538
35393539
exports[`samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.tmpdir/fablo-target/network-topology.mmd from samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json 1`] = `
3540-
"graph TD
3540+
"graph LR
35413541
3542-
subgraph Org_Orderer [Org: Orderer]
3543-
direction RL
3544-
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
3542+
classDef subgraph_padding fill:none,stroke:none
3543+
3544+
subgraph orderer_example_com [Organization: Orderer<br>orderer.example.com]
3545+
subgraph orderer_example_com_padding [ ]
35453546
direction RL
3546-
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
3547+
subgraph ord_group_group1_orderer0_group1_orderer_example_com [Orderer Group: group1<br>solo]
3548+
subgraph ord_group_group1_orderer0_group1_orderer_example_com_padding [ ]
3549+
direction RL
3550+
orderer0_group1_orderer_example_com[orderer0.group1.orderer.example.com]
3551+
end
3552+
class ord_group_group1_orderer0_group1_orderer_example_com_padding subgraph_padding
3553+
end
3554+
ca_orderer_example_com([ca.orderer.example.com<br>sqlite])
35473555
end
3548-
CA_ca_Orderer{CA: ca_Orderer - sqlite}
3556+
class orderer_example_com_padding subgraph_padding
35493557
end
35503558
3551-
subgraph Org_Org1 [Org: Org1]
3552-
direction RL
3553-
CA_ca_Org1{CA: ca_Org1 - postgres}
3554-
Org1_peer0[Peer: peer0]
3559+
subgraph org1_example_com [Organization: Org1<br>org1.example.com]
3560+
subgraph org1_example_com_padding [ ]
3561+
direction RL
3562+
ca_org1_example_com([ca.org1.example.com<br>postgres])
3563+
peer0_org1_example_com[peer0.org1.example.com<br>CouchDb]
3564+
end
3565+
class org1_example_com_padding subgraph_padding
35553566
end
35563567
3557-
subgraph Channel_my_channel1 [Channel: my-channel1]
3558-
Chaincode_chaincode1[[Chaincode: chaincode1]]
3568+
subgraph channel_my_channel1 [Channel: my-channel1]
3569+
subgraph channel_my_channel1_padding [ ]
3570+
chaincode_chaincode1[[Chaincode: chaincode1]]
3571+
end
3572+
class channel_my_channel1_padding subgraph_padding
35593573
end
35603574
35613575
%% Connections
3562-
Org1_peer0 --> Channel_my_channel1
3563-
Channel_my_channel1 --> OrdererGroup_group1"
3576+
peer0_org1_example_com --> channel_my_channel1
3577+
channel_my_channel1 --> ord_group_group1_orderer0_group1_orderer_example_com"
35643578
`;
35653579
35663580
exports[`samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json 1`] = `

e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3598,32 +3598,46 @@ echo "Executing post-start hook"
35983598
`;
35993599
36003600
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper e2e/__tmp__/samples/fablo-config-hlf2-1org-1chaincode.json.tmpdir/fablo-target/network-topology.mmd from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `
3601-
"graph TD
3601+
"graph LR
36023602
3603-
subgraph Org_Orderer [Org: Orderer]
3604-
direction RL
3605-
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
3603+
classDef subgraph_padding fill:none,stroke:none
3604+
3605+
subgraph orderer_example_com [Organization: Orderer<br>orderer.example.com]
3606+
subgraph orderer_example_com_padding [ ]
36063607
direction RL
3607-
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
3608+
subgraph ord_group_group1_orderer0_group1_orderer_example_com [Orderer Group: group1<br>solo]
3609+
subgraph ord_group_group1_orderer0_group1_orderer_example_com_padding [ ]
3610+
direction RL
3611+
orderer0_group1_orderer_example_com[orderer0.group1.orderer.example.com]
3612+
end
3613+
class ord_group_group1_orderer0_group1_orderer_example_com_padding subgraph_padding
3614+
end
3615+
ca_orderer_example_com([ca.orderer.example.com<br>sqlite])
36083616
end
3609-
CA_ca_Orderer{CA: ca_Orderer - sqlite}
3617+
class orderer_example_com_padding subgraph_padding
36103618
end
36113619
3612-
subgraph Org_Org1 [Org: Org1]
3613-
direction RL
3614-
CA_ca_Org1{CA: ca_Org1 - sqlite}
3615-
Org1_peer0[Peer: peer0]
3616-
Org1_peer1[Peer: peer1]
3620+
subgraph org1_example_com [Organization: Org1<br>org1.example.com]
3621+
subgraph org1_example_com_padding [ ]
3622+
direction RL
3623+
ca_org1_example_com([ca.org1.example.com<br>sqlite])
3624+
peer0_org1_example_com[peer0.org1.example.com<br>LevelDb]
3625+
peer1_org1_example_com[peer1.org1.example.com<br>LevelDb]
3626+
end
3627+
class org1_example_com_padding subgraph_padding
36173628
end
36183629
3619-
subgraph Channel_my_channel1 [Channel: my-channel1]
3620-
Chaincode_chaincode1[[Chaincode: chaincode1]]
3630+
subgraph channel_my_channel1 [Channel: my-channel1]
3631+
subgraph channel_my_channel1_padding [ ]
3632+
chaincode_chaincode1[[Chaincode: chaincode1]]
3633+
end
3634+
class channel_my_channel1_padding subgraph_padding
36213635
end
36223636
36233637
%% Connections
3624-
Org1_peer0 --> Channel_my_channel1
3625-
Org1_peer1 --> Channel_my_channel1
3626-
Channel_my_channel1 --> OrdererGroup_group1"
3638+
peer0_org1_example_com --> channel_my_channel1
3639+
peer1_org1_example_com --> channel_my_channel1
3640+
channel_my_channel1 --> ord_group_group1_orderer0_group1_orderer_example_com"
36273641
`;
36283642
36293643
exports[`samples/fablo-config-hlf2-1org-1chaincode.json should create proper files from samples/fablo-config-hlf2-1org-1chaincode.json 1`] = `

e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3783,36 +3783,53 @@ echo "Executing post-start hook"
37833783
`;
37843784
37853785
exports[`samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json should create proper e2e/__tmp__/samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json.tmpdir/fablo-target/network-topology.mmd from samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json 1`] = `
3786-
"graph TD
3786+
"graph LR
37873787
3788-
subgraph Org_Orderer [Org: Orderer]
3789-
direction RL
3790-
subgraph OrdererGroup_group1 [Orderer Group: group1 etcdraft]
3788+
classDef subgraph_padding fill:none,stroke:none
3789+
3790+
subgraph orderer_example_com [Organization: Orderer<br>orderer.example.com]
3791+
subgraph orderer_example_com_padding [ ]
37913792
direction RL
3792-
Orderer_orderer0_group1[Orderer: orderer0.group1 - etcdraft]
3793+
subgraph ord_group_group1_orderer0_group1_orderer_example_com [Orderer Group: group1<br>etcdraft]
3794+
subgraph ord_group_group1_orderer0_group1_orderer_example_com_padding [ ]
3795+
direction RL
3796+
orderer0_group1_orderer_example_com[orderer0.group1.orderer.example.com]
3797+
end
3798+
class ord_group_group1_orderer0_group1_orderer_example_com_padding subgraph_padding
3799+
end
3800+
ca_orderer_example_com([ca.orderer.example.com<br>sqlite])
37933801
end
3794-
CA_ca_Orderer{CA: ca_Orderer - sqlite}
3802+
class orderer_example_com_padding subgraph_padding
37953803
end
37963804
3797-
subgraph Org_Org1 [Org: Org1]
3798-
direction RL
3799-
CA_ca_Org1{CA: ca_Org1 - postgres}
3800-
Org1_peer0[Peer: peer0]
3805+
subgraph org1_example_com [Organization: Org1<br>org1.example.com]
3806+
subgraph org1_example_com_padding [ ]
3807+
direction RL
3808+
ca_org1_example_com([ca.org1.example.com<br>postgres])
3809+
peer0_org1_example_com[peer0.org1.example.com<br>CouchDb]
3810+
end
3811+
class org1_example_com_padding subgraph_padding
38013812
end
38023813
3803-
subgraph Channel_my_channel1 [Channel: my-channel1]
3804-
Chaincode_chaincode1[[Chaincode: chaincode1]]
3814+
subgraph channel_my_channel1 [Channel: my-channel1]
3815+
subgraph channel_my_channel1_padding [ ]
3816+
chaincode_chaincode1[[Chaincode: chaincode1]]
3817+
end
3818+
class channel_my_channel1_padding subgraph_padding
38053819
end
38063820
3807-
subgraph Channel_my_channel2 [Channel: my-channel2]
3808-
Chaincode_chaincode1[[Chaincode: chaincode1]]
3821+
subgraph channel_my_channel2 [Channel: my-channel2]
3822+
subgraph channel_my_channel2_padding [ ]
3823+
chaincode_chaincode1[[Chaincode: chaincode1]]
3824+
end
3825+
class channel_my_channel2_padding subgraph_padding
38093826
end
38103827
38113828
%% Connections
3812-
Org1_peer0 --> Channel_my_channel1
3813-
Org1_peer0 --> Channel_my_channel2
3814-
Channel_my_channel1 --> OrdererGroup_group1
3815-
Channel_my_channel2 --> OrdererGroup_group1"
3829+
peer0_org1_example_com --> channel_my_channel1
3830+
peer0_org1_example_com --> channel_my_channel2
3831+
channel_my_channel1 --> ord_group_group1_orderer0_group1_orderer_example_com
3832+
channel_my_channel2 --> ord_group_group1_orderer0_group1_orderer_example_com"
38163833
`;
38173834
38183835
exports[`samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json should create proper files from samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json 1`] = `

e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4555,40 +4555,57 @@ echo "Executing post-start hook"
45554555
`;
45564556
45574557
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper e2e/__tmp__/samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.tmpdir/fablo-target/network-topology.mmd from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `
4558-
"graph TD
4558+
"graph LR
45594559
4560-
subgraph Org_Orderer [Org: Orderer]
4561-
direction RL
4562-
subgraph OrdererGroup_group1 [Orderer Group: group1 solo]
4560+
classDef subgraph_padding fill:none,stroke:none
4561+
4562+
subgraph orderer_example_com [Organization: Orderer<br>orderer.example.com]
4563+
subgraph orderer_example_com_padding [ ]
45634564
direction RL
4564-
Orderer_orderer0_group1[Orderer: orderer0.group1 - solo]
4565+
subgraph ord_group_group1_orderer0_group1_orderer_example_com [Orderer Group: group1<br>solo]
4566+
subgraph ord_group_group1_orderer0_group1_orderer_example_com_padding [ ]
4567+
direction RL
4568+
orderer0_group1_orderer_example_com[orderer0.group1.orderer.example.com]
4569+
end
4570+
class ord_group_group1_orderer0_group1_orderer_example_com_padding subgraph_padding
4571+
end
4572+
ca_orderer_example_com([ca.orderer.example.com<br>sqlite])
45654573
end
4566-
CA_ca_Orderer{CA: ca_Orderer - sqlite}
4574+
class orderer_example_com_padding subgraph_padding
45674575
end
45684576
4569-
subgraph Org_Org1 [Org: Org1]
4570-
direction RL
4571-
CA_ca_Org1{CA: ca_Org1 - sqlite}
4572-
Org1_peer0[Peer: peer0]
4573-
Org1_peer1[Peer: peer1]
4577+
subgraph org1_example_com [Organization: Org1<br>org1.example.com]
4578+
subgraph org1_example_com_padding [ ]
4579+
direction RL
4580+
ca_org1_example_com([ca.org1.example.com<br>sqlite])
4581+
peer0_org1_example_com[peer0.org1.example.com<br>LevelDb]
4582+
peer1_org1_example_com[peer1.org1.example.com<br>LevelDb]
4583+
end
4584+
class org1_example_com_padding subgraph_padding
45744585
end
45754586
4576-
subgraph Org_Org2 [Org: Org2]
4577-
direction RL
4578-
CA_ca_Org2{CA: ca_Org2 - sqlite}
4579-
Org2_peer0[Peer: peer0]
4587+
subgraph org2_example_com [Organization: Org2<br>org2.example.com]
4588+
subgraph org2_example_com_padding [ ]
4589+
direction RL
4590+
ca_org2_example_com([ca.org2.example.com<br>sqlite])
4591+
peer0_org2_example_com[peer0.org2.example.com<br>LevelDb]
4592+
end
4593+
class org2_example_com_padding subgraph_padding
45804594
end
45814595
4582-
subgraph Channel_my_channel1 [Channel: my-channel1]
4583-
Chaincode_or_policy_chaincode[[Chaincode: or-policy-chaincode]]
4584-
Chaincode_and_policy_chaincode[[Chaincode: and-policy-chaincode]]
4596+
subgraph channel_my_channel1 [Channel: my-channel1]
4597+
subgraph channel_my_channel1_padding [ ]
4598+
chaincode_or_policy_chaincode[[Chaincode: or-policy-chaincode]]
4599+
chaincode_and_policy_chaincode[[Chaincode: and-policy-chaincode]]
4600+
end
4601+
class channel_my_channel1_padding subgraph_padding
45854602
end
45864603
45874604
%% Connections
4588-
Org1_peer0 --> Channel_my_channel1
4589-
Org1_peer1 --> Channel_my_channel1
4590-
Org2_peer0 --> Channel_my_channel1
4591-
Channel_my_channel1 --> OrdererGroup_group1"
4605+
peer0_org1_example_com --> channel_my_channel1
4606+
peer1_org1_example_com --> channel_my_channel1
4607+
peer0_org2_example_com --> channel_my_channel1
4608+
channel_my_channel1 --> ord_group_group1_orderer0_group1_orderer_example_com"
45924609
`;
45934610
45944611
exports[`samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml should create proper files from samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml 1`] = `

0 commit comments

Comments
 (0)