From 3b99448f8327dcb5fcabc79759269f05e6f1da49 Mon Sep 17 00:00:00 2001
From: Kurt Seifried <kurt@seifried.org>
Date: Tue, 9 Mar 2021 23:30:24 -0700
Subject: [PATCH] network.sh

---
 test-network/network.sh        | 40 ++++++++++++++++++++++++++++++++++
 test-network/scripts/envVar.sh |  2 ++
 2 files changed, 42 insertions(+)

diff --git a/test-network/network.sh b/test-network/network.sh
index 24b9481e..d4d24794 100755
--- a/test-network/network.sh
+++ b/test-network/network.sh
@@ -280,6 +280,15 @@ function networkDown() {
   # stop org3 containers also in addition to org1 and org2, in case we were running sample to add org3
   docker-compose -f $COMPOSE_FILE_BASE -f $COMPOSE_FILE_COUCH -f $COMPOSE_FILE_CA down --volumes --remove-orphans
   docker-compose -f $COMPOSE_FILE_COUCH_ORG3 -f $COMPOSE_FILE_ORG3 down --volumes --remove-orphans
+  #
+  # 4 5 6
+  #
+  docker-compose -f $COMPOSE_FILE_COUCH_ORG4 -f $COMPOSE_FILE_ORG4 down --volumes --remove-orphans
+  docker-compose -f $COMPOSE_FILE_COUCH_ORG5 -f $COMPOSE_FILE_ORG5 down --volumes --remove-orphans
+  docker-compose -f $COMPOSE_FILE_COUCH_ORG6 -f $COMPOSE_FILE_ORG6 down --volumes --remove-orphans
+  #
+  #
+  #
   # Don't remove the generated artifacts -- note, the ledgers are always removed
   if [ "$MODE" != "restart" ]; then
     # Bring down the network, deleting the volumes
@@ -294,6 +303,15 @@ function networkDown() {
     docker run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf organizations/fabric-ca/org2/msp organizations/fabric-ca/org2/tls-cert.pem organizations/fabric-ca/org2/ca-cert.pem organizations/fabric-ca/org2/IssuerPublicKey organizations/fabric-ca/org2/IssuerRevocationPublicKey organizations/fabric-ca/org2/fabric-ca-server.db'
     docker run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf organizations/fabric-ca/ordererOrg/msp organizations/fabric-ca/ordererOrg/tls-cert.pem organizations/fabric-ca/ordererOrg/ca-cert.pem organizations/fabric-ca/ordererOrg/IssuerPublicKey organizations/fabric-ca/ordererOrg/IssuerRevocationPublicKey organizations/fabric-ca/ordererOrg/fabric-ca-server.db'
     docker run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf addOrg3/fabric-ca/org3/msp addOrg3/fabric-ca/org3/tls-cert.pem addOrg3/fabric-ca/org3/ca-cert.pem addOrg3/fabric-ca/org3/IssuerPublicKey addOrg3/fabric-ca/org3/IssuerRevocationPublicKey addOrg3/fabric-ca/org3/fabric-ca-server.db'
+    #
+    # 4 5 6
+    #
+    docker run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf addOrg4/fabric-ca/org4/msp addOrg4/fabric-ca/org4/tls-cert.pem addOrg4/fabric-ca/org4/ca-cert.pem addOrg4/fabric-ca/org4/IssuerPublicKey addOrg4/fabric-ca/org4/IssuerRevocationPublicKey addOrg4/fabric-ca/org4/fabric-ca-server.db'
+    docker run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf addOrg5/fabric-ca/org5/msp addOrg5/fabric-ca/org5/tls-cert.pem addOrg5/fabric-ca/org5/ca-cert.pem addOrg5/fabric-ca/org5/IssuerPublicKey addOrg5/fabric-ca/org5/IssuerRevocationPublicKey addOrg5/fabric-ca/org5/fabric-ca-server.db'
+    docker run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf addOrg6/fabric-ca/org6/msp addOrg6/fabric-ca/org6/tls-cert.pem addOrg6/fabric-ca/org6/ca-cert.pem addOrg6/fabric-ca/org6/IssuerPublicKey addOrg6/fabric-ca/org6/IssuerRevocationPublicKey addOrg6/fabric-ca/org6/fabric-ca-server.db'
+    #
+    #
+    #
     # remove channel and script artifacts
     docker run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf channel-artifacts log.txt *.tar.gz'
   fi
@@ -324,10 +342,32 @@ COMPOSE_FILE_BASE=docker/docker-compose-test-net.yaml
 COMPOSE_FILE_COUCH=docker/docker-compose-couch.yaml
 # certificate authorities compose file
 COMPOSE_FILE_CA=docker/docker-compose-ca.yaml
+
 # use this as the docker compose couch file for org3
 COMPOSE_FILE_COUCH_ORG3=addOrg3/docker/docker-compose-couch-org3.yaml
 # use this as the default docker-compose yaml definition for org3
 COMPOSE_FILE_ORG3=addOrg3/docker/docker-compose-org3.yaml
+#
+# 4 5 6
+#
+# use this as the docker compose couch file for org4
+COMPOSE_FILE_COUCH_ORG4=addOrg4/docker/docker-compose-couch-org4.yaml
+# use this as the default docker-compose yaml definition for org4
+COMPOSE_FILE_ORG4=addOrg4/docker/docker-compose-org4.yaml
+
+# use this as the docker compose couch file for org5
+COMPOSE_FILE_COUCH_ORG5=addOrg5/docker/docker-compose-couch-org5.yaml
+# use this as the default docker-compose yaml definition for org5
+COMPOSE_FILE_ORG5=addOrg5/docker/docker-compose-org5.yaml
+
+# use this as the docker compose couch file for org6
+COMPOSE_FILE_COUCH_ORG6=addOrg6/docker/docker-compose-couch-org6.yaml
+# use this as the default docker-compose yaml definition for org6
+COMPOSE_FILE_ORG6=addOrg6/docker/docker-compose-org6.yaml
+#
+#
+#
+
 #
 # chaincode language defaults to "NA"
 CC_SRC_LANGUAGE="NA"
diff --git a/test-network/scripts/envVar.sh b/test-network/scripts/envVar.sh
index ebc39a45..a7036bd0 100755
--- a/test-network/scripts/envVar.sh
+++ b/test-network/scripts/envVar.sh
@@ -32,6 +32,7 @@ setGlobals() {
     export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG1_CA
     export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp
     export CORE_PEER_ADDRESS=localhost:7051
+
   elif [ $USING_ORG -eq 2 ]; then
     export CORE_PEER_LOCALMSPID="Org2MSP"
     export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG2_CA
@@ -43,6 +44,7 @@ setGlobals() {
     export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG3_CA
     export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp
     export CORE_PEER_ADDRESS=localhost:11051
+
   else
     errorln "ORG Unknown"
   fi