added to OSN new handler for update config of channel

Signed-off-by: Fedor Partanskiy <[email protected]>

Author: pfi79

integration/nwo/channel_participation.go

@@ -41,7 +41,7 @@ func Join(n *Network, o *Orderer, channel string, block *common.Block, expectedC
 	if n.TLSEnabled {
 		client = authClient
 	}
-	body := doBody(client, req)
+	body := doBody(client, req, http.StatusCreated)
 	c := &ChannelInfo{}
 	err = json.Unmarshal(body, c)
 	Expect(err).NotTo(HaveOccurred())
@@ -64,14 +64,71 @@ func GenerateJoinRequest(url, channel string, blockBytes []byte) *http.Request {
 	return req
 }
 
-func doBody(client *http.Client, req *http.Request) []byte {
+func Update(n *Network, o *Orderer, channel string, envelope *common.Envelope) {
+	UpdateTimeShift(n, o, channel, envelope, 0)
+}
+
+func UpdateTimeShift(n *Network, o *Orderer, channel string, envelope *common.Envelope, timeShift time.Duration) {
+	UpdateFull(n, o, channel, envelope, timeShift, http.StatusCreated, "")
+}
+
+func UpdateWithStatus(n *Network, o *Orderer, channel string, envelope *common.Envelope, expectedStatus int, errStr string) {
+	UpdateFull(n, o, channel, envelope, 0, expectedStatus, errStr)
+}
+
+func UpdateFull(n *Network, o *Orderer, channel string, envelope *common.Envelope, timeShift time.Duration, expectedStatus int, errStr string) {
+	envelopeBytes, err := proto.Marshal(envelope)
+	Expect(err).NotTo(HaveOccurred())
+
+	protocol := "http"
+	if n.TLSEnabled {
+		protocol = "https"
+	}
+	url := fmt.Sprintf("%s://127.0.0.1:%d/participation/v1/channels", protocol, n.OrdererPort(o, AdminPort))
+	req := GenerateUpdateRequest(url, channel, envelopeBytes)
+	authClient, unauthClient := OrdererOperationalClientsTimeShift(n, o, timeShift)
+
+	client := unauthClient
+	if n.TLSEnabled {
+		client = authClient
+	}
+	body := doBody(client, req, expectedStatus)
+	if errStr != "" {
+		Expect(string(body)).To(ContainSubstring(errStr))
+
+		return
+	}
+	c := &ChannelInfo{}
+	err = json.Unmarshal(body, c)
+	Expect(err).NotTo(HaveOccurred())
+}
+
+func GenerateUpdateRequest(url, channel string, envelopeBytes []byte) *http.Request {
+	updateBody := new(bytes.Buffer)
+	writer := multipart.NewWriter(updateBody)
+	part, err := writer.CreateFormFile("config-update-envelope", fmt.Sprintf("%s-update.envelope", channel))
+	Expect(err).NotTo(HaveOccurred())
+	part.Write(envelopeBytes)
+	err = writer.Close()
+	Expect(err).NotTo(HaveOccurred())
+
+	req, err := http.NewRequest(http.MethodPut, url, updateBody)
+	Expect(err).NotTo(HaveOccurred())
+	req.Header.Set("Content-Type", writer.FormDataContentType())
+
+	return req
+}
+
+func doBody(client *http.Client, req *http.Request, expectedStatus int) []byte {
 	resp, err := client.Do(req)
 	Expect(err).NotTo(HaveOccurred())
-	Expect(resp.StatusCode).To(Equal(http.StatusCreated))
+
 	bodyBytes, err := io.ReadAll(resp.Body)
 	Expect(err).NotTo(HaveOccurred())
 	resp.Body.Close()
 
+	Expect(resp.StatusCode).To(Equal(expectedStatus), string(bodyBytes))
+
 	return bodyBytes
 }
 

integration/nwo/commands/peer.go

@@ -646,32 +646,6 @@ func (s SignConfigTx) Args() []string {
 	return args
 }
 
-type ChannelUpdate struct {
-	ChannelID             string
-	Orderer               string
-	File                  string
-	ClientAuth            bool
-	TLSHandshakeTimeShift time.Duration
-}
-
-func (c ChannelUpdate) SessionName() string {
-	return "peer-channel-update"
-}
-
-func (c ChannelUpdate) Args() []string {
-	args := []string{
-		"channel", "update",
-		"--channelID", c.ChannelID,
-		"--orderer", c.Orderer,
-		"--file", c.File,
-		"--tlsHandshakeTimeShift", c.TLSHandshakeTimeShift.String(),
-	}
-	if c.ClientAuth {
-		args = append(args, "--clientauth")
-	}
-	return args
-}
-
 type ChannelInfo struct {
 	ChannelID  string
 	ClientAuth bool

integration/nwo/configblock.go

@@ -7,19 +7,19 @@ SPDX-License-Identifier: Apache-2.0
 package nwo
 
 import (
+	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
-
-	"github.com/hyperledger/fabric/common/channelconfig"
-	"github.com/hyperledger/fabric/common/policies"
 
 	"github.com/hyperledger/fabric-protos-go-apiv2/common"
 	"github.com/hyperledger/fabric-protos-go-apiv2/msp"
 	protosorderer "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
+	"github.com/hyperledger/fabric/common/channelconfig"
+	"github.com/hyperledger/fabric/common/policies"
 	"github.com/hyperledger/fabric/integration/nwo/commands"
 	"github.com/hyperledger/fabric/internal/configtxlator/update"
 	"github.com/hyperledger/fabric/protoutil"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"github.com/onsi/gomega/gexec"
@@ -126,6 +126,13 @@ func UpdateConfig(n *Network, orderer *Orderer, channel string, current, updated
 		Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
 	}
 
+	sess, err := n.PeerAdminSession(submitter, commands.SignConfigTx{
+		File:       updateFile,
+		ClientAuth: n.ClientAuthRequired,
+	})
+	Expect(err).NotTo(HaveOccurred())
+	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
+
 	var currentBlockNumber uint64
 	// get current configuration block number
 	if getConfigBlockFromOrderer {
@@ -134,15 +141,20 @@ func UpdateConfig(n *Network, orderer *Orderer, channel string, current, updated
 		currentBlockNumber = CurrentConfigBlockNumber(n, submitter, nil, channel)
 	}
 
-	sess, err := n.PeerAdminSession(submitter, commands.ChannelUpdate{
-		ChannelID:  channel,
-		Orderer:    n.OrdererAddress(orderer, ListenPort),
-		File:       updateFile,
-		ClientAuth: n.ClientAuthRequired,
-	})
+	updateEnvelopeBytes, err := os.ReadFile(updateFile)
+	Expect(err).NotTo(HaveOccurred())
+
+	updateEnvelope := &common.Envelope{}
+	err = proto.Unmarshal(updateEnvelopeBytes, updateEnvelope)
 	Expect(err).NotTo(HaveOccurred())
-	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
-	Expect(sess.Err).To(gbytes.Say("Successfully submitted channel update"))
+
+	ready := make(chan struct{})
+	go func() {
+		defer GinkgoRecover()
+		Update(n, orderer, channel, updateEnvelope)
+		close(ready)
+	}()
+	Eventually(ready, n.EventuallyTimeout).Should(BeClosed())
 
 	if getConfigBlockFromOrderer {
 		ccb := func() uint64 { return CurrentConfigBlockNumber(n, submitter, orderer, channel) }
@@ -209,47 +221,57 @@ func UpdateOrdererConfig(n *Network, orderer *Orderer, channel string, current,
 	currentBlockNumber := CurrentConfigBlockNumber(n, submitter, orderer, channel)
 	ComputeUpdateOrdererConfig(updateFile, n, channel, current, updated, submitter, additionalSigners...)
 
-	Eventually(func() bool {
-		sess, err := n.OrdererAdminSession(orderer, submitter, commands.ChannelUpdate{
-			ChannelID:  channel,
-			Orderer:    n.OrdererAddress(orderer, ListenPort),
-			File:       updateFile,
-			ClientAuth: n.ClientAuthRequired,
-		})
-		Expect(err).NotTo(HaveOccurred())
+	updateEnvelopeBytes, err := os.ReadFile(updateFile)
+	Expect(err).NotTo(HaveOccurred())
 
-		sess.Wait(n.EventuallyTimeout)
-		if sess.ExitCode() != 0 {
-			return false
-		}
+	updateEnvelope := &common.Envelope{}
+	err = proto.Unmarshal(updateEnvelopeBytes, updateEnvelope)
+	Expect(err).NotTo(HaveOccurred())
 
-		return strings.Contains(string(sess.Err.Contents()), "Successfully submitted channel update")
-	}, n.EventuallyTimeout).Should(BeTrue())
+	ready := make(chan struct{})
+	go func() {
+		defer GinkgoRecover()
+		Update(n, orderer, channel, updateEnvelope)
+		close(ready)
+	}()
+	Eventually(ready, n.EventuallyTimeout).Should(BeClosed())
 
 	// wait for the block to be committed
 	ccb := func() uint64 { return CurrentConfigBlockNumber(n, submitter, orderer, channel) }
 	Eventually(ccb, n.EventuallyTimeout).Should(BeNumerically(">", currentBlockNumber))
 }
 
-// UpdateOrdererConfigSession computes, signs, and submits a configuration
+// UpdateOrdererConfigFails computes, signs, and submits a configuration
 // update which requires orderer signatures. The caller should wait on the
 // returned seession retrieve the exit code.
-func UpdateOrdererConfigSession(n *Network, orderer *Orderer, channel string, current, updated *common.Config, submitter *Peer, additionalSigners ...*Orderer) *gexec.Session {
+func UpdateOrdererConfigFails(n *Network, orderer *Orderer, channel string, current, updated *common.Config, errStr string, submitter *Peer, additionalSigners ...*Orderer) {
 	tempDir, err := os.MkdirTemp(n.RootDir, "updateConfig")
 	Expect(err).NotTo(HaveOccurred())
 	updateFile := filepath.Join(tempDir, "update.pb")
 
 	ComputeUpdateOrdererConfig(updateFile, n, channel, current, updated, submitter, additionalSigners...)
 
-	// session should not return with a zero exit code nor with a success response
-	sess, err := n.OrdererAdminSession(orderer, submitter, commands.ChannelUpdate{
-		ChannelID:  channel,
-		Orderer:    n.OrdererAddress(orderer, ListenPort),
+	sess, err := n.OrdererAdminSession(orderer, submitter, commands.SignConfigTx{
 		File:       updateFile,
 		ClientAuth: n.ClientAuthRequired,
 	})
 	Expect(err).NotTo(HaveOccurred())
-	return sess
+	Eventually(sess, n.EventuallyTimeout).Should(gexec.Exit(0))
+
+	updateEnvelopeBytes, err := os.ReadFile(updateFile)
+	Expect(err).NotTo(HaveOccurred())
+
+	updateEnvelope := &common.Envelope{}
+	err = proto.Unmarshal(updateEnvelopeBytes, updateEnvelope)
+	Expect(err).NotTo(HaveOccurred())
+
+	ready := make(chan struct{})
+	go func() {
+		defer GinkgoRecover()
+		UpdateWithStatus(n, orderer, channel, updateEnvelope, http.StatusBadRequest, errStr)
+		close(ready)
+	}()
+	Eventually(ready, n.EventuallyTimeout).Should(BeClosed())
 }
 
 func ComputeUpdateOrdererConfig(updateFile string, n *Network, channel string, current, updated *common.Config, submitter *Peer, additionalSigners ...*Orderer) {

integration/raft/cft_test.go

@@ -16,7 +16,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -347,6 +346,7 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Adding new ordering service node")
+			Consistently(ordererRunners[0].Err(), 5*time.Second, time.Second).ShouldNot(gbytes.Say("active nodes store"))
 			addConsenter(network, peer, orderers[0], "testchannel", &etcdraft.Consenter{
 				ServerTlsCert: ordererCert,
 				ClientTlsCert: ordererCert,
@@ -738,6 +738,7 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 			for _, orderer := range orderers {
 				ordererConfig := network.ReadOrdererConfig(orderer)
 				ordererConfig.General.Cluster.TLSHandshakeTimeShift = 5 * time.Minute
+				ordererConfig.Admin.TLS.TLSHandshakeTimeShift = 5 * time.Minute
 				network.WriteOrdererConfig(orderer, ordererConfig)
 			}
 
@@ -809,6 +810,8 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 			for _, orderer := range orderers {
 				ordererConfig := network.ReadOrdererConfig(orderer)
 				ordererConfig.General.TLS.TLSHandshakeTimeShift = 5 * time.Minute
+				ordererConfig.Admin.TLS.TLSHandshakeTimeShift = 5 * time.Minute
+				ordererConfig.Admin.TLS.Enabled = true
 				network.WriteOrdererConfig(orderer, ordererConfig)
 			}
 
@@ -825,7 +828,8 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 
 			By("submitting config updates to orderers with expired TLS certs to replace the expired certs")
 			timeShift := 5 * time.Minute
-			for _, o := range orderers {
+			ordererRunners := []*ginkgomon.Runner{o1Runner, o2Runner, o3Runner}
+			for i, o := range orderers {
 				channelConfig := fetchConfig(network, peer, o, nwo.ClusterPort, "testchannel", timeShift)
 				c := conftx.New(channelConfig)
 				err = c.Orderer().RemoveConsenter(consenterChannelConfig(network, o))
@@ -837,7 +841,8 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 				Expect(err).NotTo(HaveOccurred())
 
 				By("updating the config for " + o.Name)
-				updateOrdererConfig(network, o, nwo.ClusterPort, "testchannel", timeShift, c.OriginalConfig(), c.UpdatedConfig(), peer)
+				Consistently(ordererRunners[i].Err(), 5*time.Second, time.Second).ShouldNot(gbytes.Say("active nodes store"))
+				updateOrdererConfig(network, o, nwo.ClusterPort, "testchannel", timeShift, c.OriginalConfig(), c.UpdatedConfig(), peer, o)
 			}
 
 			By("Killing orderers #5")
@@ -856,6 +861,7 @@ var _ = Describe("EndToEnd Crash Fault Tolerance", func() {
 			for _, o := range orderers {
 				ordererConfig := network.ReadOrdererConfig(o)
 				ordererConfig.General.TLS.TLSHandshakeTimeShift = 0
+				ordererConfig.Admin.TLS.TLSHandshakeTimeShift = 0
 				network.WriteOrdererConfig(o, ordererConfig)
 			}
 
@@ -1324,23 +1330,20 @@ func updateOrdererConfig(n *nwo.Network, orderer *nwo.Orderer, port nwo.PortName
 	currentBlockNumber := currentConfigBlockNumber(n, submitter, orderer, port, channel, tlsHandshakeTimeShift)
 	nwo.ComputeUpdateOrdererConfig(updateFile, n, channel, current, updated, submitter, additionalSigners...)
 
-	Eventually(func() bool {
-		sess, err := n.OrdererAdminSession(orderer, submitter, commands.ChannelUpdate{
-			ChannelID:             channel,
-			Orderer:               n.OrdererAddress(orderer, port),
-			File:                  updateFile,
-			ClientAuth:            n.ClientAuthRequired,
-			TLSHandshakeTimeShift: tlsHandshakeTimeShift,
-		})
-		Expect(err).NotTo(HaveOccurred())
+	updateEnvelopeBytes, err := os.ReadFile(updateFile)
+	Expect(err).NotTo(HaveOccurred())
 
-		sess.Wait(n.EventuallyTimeout)
-		if sess.ExitCode() != 0 {
-			return false
-		}
+	updateEnvelope := &common.Envelope{}
+	err = proto.Unmarshal(updateEnvelopeBytes, updateEnvelope)
+	Expect(err).NotTo(HaveOccurred())
 
-		return strings.Contains(string(sess.Err.Contents()), "Successfully submitted channel update")
-	}, n.EventuallyTimeout).Should(BeTrue())
+	ready := make(chan struct{})
+	go func() {
+		defer GinkgoRecover()
+		nwo.UpdateTimeShift(n, orderer, channel, updateEnvelope, tlsHandshakeTimeShift)
+		close(ready)
+	}()
+	Eventually(ready, n.EventuallyTimeout).Should(BeClosed())
 
 	ccb := func() uint64 {
 		return currentConfigBlockNumber(n, submitter, orderer, port, channel, tlsHandshakeTimeShift)