[FAB-10365] Separate the Deployment from World

This separates Deployment from the World config
setup and allows a dev to call multiple deployments
on a channel with a designated list of peers.

If one chooses to deploy to a subset of peers, this
is allowed by being explicit in the call to SetupChannel.

Change-Id: I074192ca607ec6f0b7362eeff35e98026c135b42
Signed-off-by: Latitia M. Haskins <latitia.haskins@gmail.com>

Author: lhaskins

integration/e2e/e2e_test.go

@@ -8,6 +8,8 @@ package e2e
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
 	"path/filepath"
 	"syscall"
 	"time"
@@ -23,8 +25,9 @@ import (
 
 var _ = Describe("EndToEnd", func() {
 	var (
-		client *docker.Client
-		w      world.World
+		client     *docker.Client
+		w          world.World
+		deployment world.Deployment
 	)
 
 	BeforeEach(func() {
@@ -42,7 +45,7 @@ var _ = Describe("EndToEnd", func() {
 
 		// Stop the running chaincode containers
 		filters := map[string][]string{}
-		filters["name"] = []string{fmt.Sprintf("%s-%s", w.Deployment.Chaincode.Name, w.Deployment.Chaincode.Version)}
+		filters["name"] = []string{fmt.Sprintf("%s-%s", deployment.Chaincode.Name, deployment.Chaincode.Version)}
 		allContainers, _ := client.ListContainers(docker.ListContainersOptions{
 			Filters: filters,
 		})
@@ -57,7 +60,7 @@ var _ = Describe("EndToEnd", func() {
 
 		// Remove chaincode image
 		filters = map[string][]string{}
-		filters["label"] = []string{fmt.Sprintf("org.hyperledger.fabric.chaincode.id.name=%s", w.Deployment.Chaincode.Name)}
+		filters["label"] = []string{fmt.Sprintf("org.hyperledger.fabric.chaincode.id.name=%s", deployment.Chaincode.Name)}
 		images, _ := client.ListImages(docker.ListImagesOptions{
 			Filters: filters,
 		})
@@ -84,8 +87,21 @@ var _ = Describe("EndToEnd", func() {
 	It("executes a basic solo network with 2 orgs", func() {
 		w = world.GenerateBasicConfig("solo", 1, 2, testDir, components)
 
+		deployment = world.Deployment{
+			Channel: "testchannel",
+			Chaincode: world.Chaincode{
+				Name:     "mycc",
+				Version:  "0.0",
+				Path:     filepath.Join("github.com", "hyperledger", "fabric", "integration", "chaincode", "simple", "cmd"),
+				ExecPath: os.Getenv("PATH"),
+			},
+			InitArgs: `{"Args":["init","a","100","b","200"]}`,
+			Policy:   `OR ('Org1MSP.member','Org2MSP.member')`,
+			Orderer:  "127.0.0.1:7050",
+		}
+
 		By("generating files to bootstrap the network")
-		w.BootstrapNetwork()
+		w.BootstrapNetwork(deployment.Channel)
 		Expect(filepath.Join(testDir, "configtx.yaml")).To(BeARegularFile())
 		Expect(filepath.Join(testDir, "crypto.yaml")).To(BeARegularFile())
 		Expect(filepath.Join(testDir, "crypto", "peerOrganizations")).To(BeADirectory())
@@ -103,48 +119,65 @@ var _ = Describe("EndToEnd", func() {
 		w.BuildNetwork()
 
 		By("setting up the channel")
-		err := w.SetupChannel()
+		peers := []string{
+			"peer0.org1.example.com",
+			"peer0.org2.example.com",
+		}
+		err := w.SetupChannel(deployment, peers)
 		Expect(err).NotTo(HaveOccurred())
 
 		By("querying the chaincode")
 		adminPeer := components.Peer()
 		adminPeer.LogLevel = "debug"
-		adminPeer.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
+		adminPeer.ConfigDir = filepath.Join(testDir, "peer0.org1.example.com")
 		adminPeer.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner := adminPeer.QueryChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["query","a"]}`)
+		adminRunner := adminPeer.QueryChaincode(deployment.Chaincode.Name, deployment.Channel, `{"Args":["query","a"]}`)
 		execute(adminRunner)
 		Eventually(adminRunner.Buffer()).Should(gbytes.Say("100"))
 
 		By("invoking the chaincode")
-		adminRunner = adminPeer.InvokeChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["invoke","a","b","10"]}`, w.Deployment.Orderer)
+		adminRunner = adminPeer.InvokeChaincode(deployment.Chaincode.Name, deployment.Channel, `{"Args":["invoke","a","b","10"]}`, deployment.Orderer)
 		execute(adminRunner)
 		Eventually(adminRunner.Err()).Should(gbytes.Say("Chaincode invoke successful. result: status:200"))
 
 		By("querying the chaincode again")
-		adminRunner = adminPeer.QueryChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["query","a"]}`)
+		adminRunner = adminPeer.QueryChaincode(deployment.Chaincode.Name, deployment.Channel, `{"Args":["query","a"]}`)
 		execute(adminRunner)
 		Eventually(adminRunner.Buffer()).Should(gbytes.Say("90"))
 
 		By("updating the channel")
 		adminPeer = components.Peer()
-		adminPeer.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
+		adminPeer.ConfigDir = filepath.Join(testDir, "peer0.org1.example.com")
 		adminPeer.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner = adminPeer.UpdateChannel(filepath.Join(testDir, "Org1_anchors_update_tx.pb"), w.Deployment.Channel, w.Deployment.Orderer)
+		adminRunner = adminPeer.UpdateChannel(filepath.Join(testDir, "Org1_anchors_update_tx.pb"), deployment.Channel, deployment.Orderer)
 		execute(adminRunner)
 		Eventually(adminRunner.Err()).Should(gbytes.Say("Successfully submitted channel update"))
 	})
 
 	It("executes a basic kafka network with 2 orgs", func() {
 		By("generating files to bootstrap the network")
 		w = world.GenerateBasicConfig("kafka", 2, 2, testDir, components)
-		setupWorld(&w)
+		deployment = world.Deployment{
+			Channel: "testchannel",
+			Chaincode: world.Chaincode{
+				Name:     "mycc",
+				Version:  "0.0",
+				Path:     filepath.Join("github.com", "hyperledger", "fabric", "integration", "chaincode", "simple", "cmd"),
+				ExecPath: os.Getenv("PATH"),
+			},
+			InitArgs: `{"Args":["init","a","100","b","200"]}`,
+			Policy:   `AND ('Org1MSP.member','Org2MSP.member')`,
+			Orderer:  "127.0.0.1:7050",
+		}
+
+		w.SetupWorld(deployment)
 
 		By("querying the chaincode")
 		adminPeer := components.Peer()
 		adminPeer.LogLevel = "debug"
-		adminPeer.ConfigDir = filepath.Join(testDir, "org1.example.com_0")
+		adminPeer.ConfigDir = filepath.Join(testDir, "peer0.org1.example.com")
 		adminPeer.MSPConfigPath = filepath.Join(testDir, "crypto", "peerOrganizations", "org1.example.com", "users", "Admin@org1.example.com", "msp")
-		adminRunner := adminPeer.QueryChaincode(w.Deployment.Chaincode.Name, w.Deployment.Channel, `{"Args":["query","a"]}`)
+		adminRunner := adminPeer.QueryChaincode(deployment.Chaincode.Name, deployment.Channel, `{"Args":["query","a"]}`)
 		execute(adminRunner)
 		Eventually(adminRunner.Buffer()).Should(gbytes.Say("100"))
 
@@ -157,3 +190,26 @@ func execute(r ifrit.Runner) (err error) {
 	Eventually(p.Wait(), 30*time.Second).Should(Receive(&err))
 	return err
 }
+
+func copyFile(src, dest string) {
+	data, err := ioutil.ReadFile(src)
+	Expect(err).NotTo(HaveOccurred())
+	err = ioutil.WriteFile(dest, data, 0775)
+	Expect(err).NotTo(HaveOccurred())
+}
+
+func copyPeerConfigs(peerOrgs []world.PeerOrgConfig, rootPath string) {
+	for _, peerOrg := range peerOrgs {
+		for peer := 0; peer < peerOrg.PeerCount; peer++ {
+			peerDir := fmt.Sprintf("peer%d.%s", peer, peerOrg.Domain)
+			if _, err := os.Stat(filepath.Join(rootPath, peerDir)); os.IsNotExist(err) {
+				err := os.Mkdir(filepath.Join(rootPath, peerDir), 0755)
+				Expect(err).NotTo(HaveOccurred())
+			}
+			copyFile(
+				filepath.Join("testdata", fmt.Sprintf("%s_%d-core.yaml", peerOrg.Domain, peer)),
+				filepath.Join(rootPath, peerDir, "core.yaml"),
+			)
+		}
+	}
+}