Add ability to package chaincode to nwo

FAB-11717 #done

Change-Id: Icefeca8d05e8c114a0150d7c34d2b7035b276dfd
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

Author: wlahti

integration/nwo/commands/peer.go

@@ -88,11 +88,40 @@ func (c ChannelFetch) Args() []string {
 	return args
 }
 
+type ChaincodePackage struct {
+	Name       string
+	Version    string
+	Path       string
+	Lang       string
+	OutputFile string
+}
+
+func (c ChaincodePackage) SessionName() string {
+	return "peer-chaincode-package"
+}
+
+func (c ChaincodePackage) Args() []string {
+	args := []string{
+		"chaincode", "package",
+		"--name", c.Name,
+		"--version", c.Version,
+		"--path", c.Path,
+		c.OutputFile,
+	}
+
+	if c.Lang != "" {
+		args = append(args, "--lang", c.Lang)
+	}
+
+	return args
+}
+
 type ChaincodeInstall struct {
-	Name    string
-	Version string
-	Path    string
-	Lang    string
+	Name        string
+	Version     string
+	Path        string
+	Lang        string
+	PackageFile string
 }
 
 func (c ChaincodeInstall) SessionName() string {
@@ -102,11 +131,20 @@ func (c ChaincodeInstall) SessionName() string {
 func (c ChaincodeInstall) Args() []string {
 	args := []string{
 		"chaincode", "install",
-		"--name", c.Name,
-		"--version", c.Version,
-		"--path", c.Path,
 	}
 
+	if c.PackageFile != "" {
+		args = append(args, c.PackageFile)
+	}
+	if c.Name != "" {
+		args = append(args, "--name", c.Name)
+	}
+	if c.Version != "" {
+		args = append(args, "--version", c.Version)
+	}
+	if c.Path != "" {
+		args = append(args, "--path", c.Path)
+	}
 	if c.Lang != "" {
 		args = append(args, "--lang", c.Lang)
 	}

integration/nwo/deploy.go

@@ -8,6 +8,8 @@ package nwo
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
 
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
@@ -24,6 +26,7 @@ type Chaincode struct {
 	Policy            string
 	Lang              string
 	CollectionsConfig string // optional
+	PackageFile       string
 }
 
 // DeployChaincode is a helper that will install chaincode to all peers that
@@ -37,20 +40,45 @@ func DeployChaincode(n *Network, channel string, orderer *Orderer, chaincode Cha
 		return
 	}
 
+	// create temp file for chaincode package if not provided
+	if chaincode.PackageFile == "" {
+		tempFile, err := ioutil.TempFile("", "chaincode-package")
+		Expect(err).NotTo(HaveOccurred())
+		tempFile.Close()
+		defer os.Remove(tempFile.Name())
+		chaincode.PackageFile = tempFile.Name()
+	}
+
+	// package using the first peer
+	PackageChaincode(n, chaincode, peers[0])
+
 	// install on all peers
 	InstallChaincode(n, chaincode, peers...)
 
 	// instantiate on the first peer
 	InstantiateChaincode(n, channel, orderer, chaincode, peers[0], peers...)
 }
 
+func PackageChaincode(n *Network, chaincode Chaincode, peer *Peer) {
+	sess, err := n.PeerAdminSession(peer, commands.ChaincodePackage{
+		Name:       chaincode.Name,
+		Version:    chaincode.Version,
+		Path:       chaincode.Path,
+		Lang:       chaincode.Lang,
+		OutputFile: chaincode.PackageFile,
+	})
+	Expect(err).NotTo(HaveOccurred())
+	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
+}
+
 func InstallChaincode(n *Network, chaincode Chaincode, peers ...*Peer) {
 	for _, p := range peers {
 		sess, err := n.PeerAdminSession(p, commands.ChaincodeInstall{
-			Name:    chaincode.Name,
-			Version: chaincode.Version,
-			Path:    chaincode.Path,
-			Lang:    chaincode.Lang,
+			Name:        chaincode.Name,
+			Version:     chaincode.Version,
+			Path:        chaincode.Path,
+			Lang:        chaincode.Lang,
+			PackageFile: chaincode.PackageFile,
 		})
 		Expect(err).NotTo(HaveOccurred())
 		Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))

integration/nwo/network_test.go

@@ -128,7 +128,7 @@ var _ = Describe("Network", func() {
 		It("deploys and executes chaincode (the hard way)", func() {
 			// This demonstrates how to control the processes that make up a network.
 			// If you don't care about a collection of processes (like the brokers or
-			// the orderers) use the group runner to manage thos processes.
+			// the orderers) use the group runner to manage those processes.
 			zookeepers := []string{}
 			for i := 0; i < network.Consensus.ZooKeepers; i++ {
 				zk := network.ZooKeeperRunner(i)