[FAB-12492] run peers session with orderer usr org

This commit adds ability to spwan peers sessions configured with orderer
service admin users. In particular this is usefull if we wold like to
simulate in integration test configuration update related to the
ordering service where default modification policy requires signature of
the orderer org admin user.

Change-Id: I95f6ac57a21ca8f1dde799d5151ee203b32e7b99
Signed-off-by: Artem Barger <bartem@il.ibm.com>

Author: C0rWin

integration/nwo/configblock.go

@@ -110,6 +110,56 @@ func UpdateConfig(n *Network, orderer *Orderer, channel string, current, updated
 	Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
 }
 
+// UpdateOrdererConfig computes, signs, and submits a configuration update which requires orderers signature and waits
+// for the update to complete.
+func UpdateOrdererConfig(n *Network, orderer *Orderer, channel string, current, updated *common.Config, submitter *Peer, additionalSigners ...*Orderer) {
+	tempDir, err := ioutil.TempDir("", "updateConfig")
+	Expect(err).NotTo(HaveOccurred())
+	defer os.RemoveAll(tempDir)
+
+	// compute update
+	configUpdate, err := update.Compute(current, updated)
+	Expect(err).NotTo(HaveOccurred())
+	configUpdate.ChannelId = channel
+
+	signedEnvelope, err := utils.CreateSignedEnvelope(
+		common.HeaderType_CONFIG_UPDATE,
+		channel,
+		nil, // local signer
+		&common.ConfigUpdateEnvelope{ConfigUpdate: utils.MarshalOrPanic(configUpdate)},
+		0, // message version
+		0, // epoch
+	)
+	Expect(err).NotTo(HaveOccurred())
+	Expect(signedEnvelope).NotTo(BeNil())
+
+	updateFile := filepath.Join(tempDir, "update.pb")
+	err = ioutil.WriteFile(updateFile, utils.MarshalOrPanic(signedEnvelope), 0600)
+	Expect(err).NotTo(HaveOccurred())
+
+	for _, signer := range additionalSigners {
+		sess, err := n.OrdererAdminSession(signer, submitter, commands.SignConfigTx{File: updateFile})
+		Expect(err).NotTo(HaveOccurred())
+		Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
+	}
+
+	// get current configuration block number
+	currentBlockNumber := CurrentConfigBlockNumber(n, submitter, orderer, channel)
+
+	sess, err := n.PeerAdminSession(submitter, commands.ChannelUpdate{
+		ChannelID: channel,
+		Orderer:   n.OrdererAddress(orderer, ListenPort),
+		File:      updateFile,
+	})
+	Expect(err).NotTo(HaveOccurred())
+	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
+	Expect(sess.Err).To(gbytes.Say("Successfully submitted channel update"))
+
+	// wait for the block to be committed
+	ccb := func() uint64 { return CurrentConfigBlockNumber(n, submitter, orderer, channel) }
+	Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
+}
+
 // CurrentConfigBlockNumber retrieves the block number from the header of the
 // current config block. This can be used to detect whena configuration change
 // has completed.

integration/nwo/network.go

@@ -20,7 +20,7 @@ import (
 	"text/template"
 	"time"
 
-	docker "github.com/fsouza/go-dockerclient"
+	"github.com/fsouza/go-dockerclient"
 	"github.com/hyperledger/fabric/integration/helpers"
 	"github.com/hyperledger/fabric/integration/nwo/commands"
 	"github.com/hyperledger/fabric/integration/nwo/fabricconfig"
@@ -308,16 +308,31 @@ func (n *Network) WritePeerConfig(p *Peer, config *fabricconfig.Core) {
 	Expect(err).NotTo(HaveOccurred())
 }
 
-// peerUserCrpytoDir returns the path to the directory containing the
+// peerUserCryptoDir returns the path to the directory containing the
 // certificates and keys for the specified user of the peer.
-func (n *Network) peerUserCrpytoDir(p *Peer, user, cryptoMaterialType string) string {
+func (n *Network) peerUserCryptoDir(p *Peer, user, cryptoMaterialType string) string {
 	org := n.Organization(p.Organization)
 	Expect(org).NotTo(BeNil())
 
+	return n.userCryptoDir(org, "peerOrganizations", user, cryptoMaterialType)
+}
+
+// ordererUserCryptoDir returns the path to the directory containing the
+// certificates and keys for the specified user of the orderer.
+func (n *Network) ordererUserCryptoDir(o *Orderer, user, cryptoMaterialType string) string {
+	org := n.Organization(o.Organization)
+	Expect(org).NotTo(BeNil())
+
+	return n.userCryptoDir(org, "ordererOrganizations", user, cryptoMaterialType)
+}
+
+// userCryptoDir returns the path to the folder with crypto materials for either peers or orderer organizations
+// specific user
+func (n *Network) userCryptoDir(org *Organization, nodeOrganizationType, user, cryptoMaterialType string) string {
 	return filepath.Join(
 		n.RootDir,
 		"crypto",
-		"peerOrganizations",
+		nodeOrganizationType,
 		org.Domain,
 		"users",
 		fmt.Sprintf("%s@%s", user, org.Domain),
@@ -328,13 +343,19 @@ func (n *Network) peerUserCrpytoDir(p *Peer, user, cryptoMaterialType string) st
 // PeerUserMSPDir returns the path to the MSP directory containing the
 // certificates and keys for the specified user of the peer.
 func (n *Network) PeerUserMSPDir(p *Peer, user string) string {
-	return n.peerUserCrpytoDir(p, user, "msp")
+	return n.peerUserCryptoDir(p, user, "msp")
+}
+
+// OrdererUserMSPDir returns the path to the MSP directory containing the
+// certificates and keys for the specified user of the peer.
+func (n *Network) OrdererUserMSPDir(o *Orderer, user string) string {
+	return n.ordererUserCryptoDir(o, user, "msp")
 }
 
 // PeerUserTLSDir returns the path to the TLS directory containing the
 // certificates and keys for the specified user of the peer.
 func (n *Network) PeerUserTLSDir(p *Peer, user string) string {
-	return n.peerUserCrpytoDir(p, user, "tls")
+	return n.peerUserCryptoDir(p, user, "tls")
 }
 
 // PeerUserCert returns the path to the certificate for the specified user in
@@ -960,6 +981,18 @@ func (n *Network) PeerUserSession(p *Peer, user string, command Command) (*gexec
 	return n.StartSession(cmd, command.SessionName())
 }
 
+// OrdererAdminSession execute a gexec.Session as an orderer node admin user. This is used primarily
+// to generate orderer configuration updates
+func (n *Network) OrdererAdminSession(o *Orderer, p *Peer, command Command) (*gexec.Session, error) {
+	cmd := n.peerCommand(
+		command,
+		"CORE_PEER_LOCALMSPID=OrdererMSP",
+		fmt.Sprintf("FABRIC_CFG_PATH=%s", n.PeerDir(p)),
+		fmt.Sprintf("CORE_PEER_MSPCONFIGPATH=%s", n.OrdererUserMSPDir(o, "Admin")),
+	)
+	return n.StartSession(cmd, command.SessionName())
+}
+
 // Peer returns the information about the named Peer in the named organization.
 func (n *Network) Peer(orgName, peerName string) *Peer {
 	for _, p := range n.PeersInOrg(orgName) {