Test muliple orderer group (v3)

Signed-off-by: Osama Rabea <osrab3@gmail.com>

Author: OsamaRab3

e2e-network/docker/test-05-v3.sh

@@ -51,15 +51,15 @@ trap 'networkDown ; echo "Test failed" ; exit 1' ERR SIGINT
 # start the network
 networkUp
 
-waitForContainer "orderer0.group1.orderer.example.com" "Starting raft node as part of a new channel channel=my-channel1"
+waitForContainer "orderer0.group1.orderer1.example.com" "Starting raft node as part of a new channel channel=my-channel1"
+waitForContainer "orderer0.group2.orderer2.example.com" "Starting raft node as part of a new channel channel=my-channel2"
 waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
 waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
-waitForContainer "peer1.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
+waitForContainer "peer1.org1.example.com" "Joining gossip network of channel my-channel2 with 1 organizations"
 waitForContainer "peer0.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel1"
 waitForContainer "peer0.org1.example.com" "Anchor peer.*with same endpoint, skipping connecting to myself"
-waitForContainer "peer0.org1.example.com" "Membership view has changed. peers went online:.*peer1.org1.example.com:7042"
-waitForContainer "peer1.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel1"
-waitForContainer "peer1.org1.example.com" "Membership view has changed. peers went online:.*peer0.org1.example.com:7041"
+waitForContainer "peer1.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel2"
+waitForContainer "peer1.org1.example.com" "Anchor peer.*with same endpoint, skipping connecting to myself"
 
 # Test simple chaincode
 expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \

samples/fablo-config-hlf3-1orgs-1chaincode.json

@@ -10,14 +10,27 @@
     "orgs": [
       {
         "organization": {
-          "name": "Orderer",
-          "domain": "orderer.example.com"
+          "name": "Orderer1",
+          "domain": "orderer1.example.com"
         },
         "orderers": [
           {
             "groupName": "group1",
             "type": "raft",
-            "instances": 4
+            "instances": 3
+          }
+        ]
+      },
+      {
+        "organization": {
+          "name": "Orderer2",
+          "domain": "orderer2.example.com"
+        },
+        "orderers": [
+          {
+            "groupName": "group2",
+            "type": "raft",
+            "instances": 1
           }
         ]
       },
@@ -35,6 +48,7 @@
     "channels": [
       {
         "name": "my-channel1",
+        "ordererGroup": "group1",
         "orgs": [
           {
             "name": "Org1",
@@ -44,6 +58,18 @@
             ]
           }
         ]
+      },
+      {
+        "name": "my-channel2",
+        "ordererGroup": "group2",
+        "orgs": [
+          {
+            "name": "Org1",
+            "peers": [
+              "peer1"
+            ]
+          }
+        ]
       }
     ],
     "chaincodes": [