Generalize EnableCapabilities function for int. tests

FAB-15524 #done

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

Author: wlahti

integration/discovery/discovery_test.go

@@ -206,8 +206,8 @@ var _ = Describe("DiscoveryService", func() {
 		// using _lifecycle
 		//
 
-		By("enabling V2_0 capabilities on the channel")
-		nwo.EnableV2_0Capabilities(network, "testchannel", orderer, org1Peer0, org2Peer0, org3Peer0)
+		By("enabling V2_0 application capabilities on the channel")
+		nwo.EnableCapabilities(network, "testchannel", "Application", "V2_0", orderer, org1Peer0, org2Peer0, org3Peer0)
 
 		By("discovering endorsers when missing chaincode")
 		endorsers = commands.Endorsers{
@@ -401,7 +401,8 @@ var _ = Describe("DiscoveryService", func() {
 		//
 		// using _lifecycle
 		//
-		nwo.EnableV2_0Capabilities(network, "testchannel", orderer, org1Peer0, org2Peer0, org3Peer0)
+		By("enabling V2_0 application capabilities on the channel")
+		nwo.EnableCapabilities(network, "testchannel", "Application", "V2_0", orderer, org1Peer0, org2Peer0, org3Peer0)
 
 		By("deploying chaincode using _lifecycle")
 		chaincode = nwo.Chaincode{

integration/e2e/acl_test.go

@@ -289,7 +289,7 @@ var _ = Describe("EndToEndACL", func() {
 		nwo.InstallChaincodeNewLifecycle(network, chaincode, org1Peer0, org2Peer0)
 
 		//
-		// when the V2_0 capabilities flag has not yet been enabled
+		// when the V2_0 application capabilities flag has not yet been enabled
 		//
 		By("approving a chaincode definition on a channel without V2_0 capabilities enabled")
 		sess, err = network.PeerAdminSession(org1Peer0, commands.ChaincodeApproveForMyOrgLifecycle{
@@ -327,9 +327,9 @@ var _ = Describe("EndToEndACL", func() {
 		Eventually(sess, network.EventuallyTimeout).Should(gexec.Exit())
 		Expect(sess.Err).To(gbytes.Say("Error: proposal failed with status: 500 - cannot use new lifecycle for channel 'testchannel' as it does not have the required capabilities enabled"))
 
-		// enable V2_0 Capabilities on the channel
-		By("enabling V2_0 capabilities")
-		nwo.EnableV2_0Capabilities(network, "testchannel", orderer, org1Peer0, org2Peer0)
+		// enable V2_0 application capabilities on the channel
+		By("enabling V2_0 application capabilities on the channel")
+		nwo.EnableCapabilities(network, "testchannel", "Application", "V2_0", orderer, org1Peer0, org2Peer0)
 
 		//
 		// when the ACL policy for _lifecycle/ApproveChaincodeDefinitionForOrg is not satisfied

integration/nwo/deploy.go

@@ -401,25 +401,24 @@ func listInstantiated(n *Network, peer *Peer, channel string) func() *gbytes.Buf
 	}
 }
 
-// EnableV2_0Capabilities enables the V2_0 capabilities for a running network.
+// EnableCapabilities enables a specific capabilities flag for a running network.
 // It generates the config update using the first peer, signs the configuration
 // with the subsequent peers, and then submits the config update using the
 // first peer.
-func EnableV2_0Capabilities(network *Network, channel string, orderer *Orderer, peers ...*Peer) {
+func EnableCapabilities(network *Network, channel, capabilitiesGroup, capabilitiesVersion string, orderer *Orderer, peers ...*Peer) {
 	if len(peers) == 0 {
 		return
 	}
 
 	config := GetConfig(network, peers[0], orderer, channel)
 	updatedConfig := proto.Clone(config).(*common.Config)
 
-	// include the V2_0 capability in the config
-	updatedConfig.ChannelGroup.Groups["Application"].Values["Capabilities"] = &common.ConfigValue{
+	updatedConfig.ChannelGroup.Groups[capabilitiesGroup].Values["Capabilities"] = &common.ConfigValue{
 		ModPolicy: "Admins",
 		Value: protoutil.MarshalOrPanic(
 			&common.Capabilities{
 				Capabilities: map[string]*common.Capability{
-					"V2_0": {},
+					capabilitiesVersion: {},
 				},
 			},
 		),

integration/nwo/network_test.go

@@ -115,7 +115,7 @@ var _ = Describe("Network", func() {
 			network.UpdateChannelAnchors(orderer, "testchannel")
 			network.VerifyMembership(network.PeersWithChannel("testchannel"), "testchannel")
 
-			nwo.EnableV2_0Capabilities(network, "testchannel", orderer, network.Peer("org1", "peer1"), network.Peer("org2", "peer1"))
+			nwo.EnableCapabilities(network, "testchannel", "Application", "V2_0", orderer, network.Peer("org1", "peer1"), network.Peer("org2", "peer1"))
 			nwo.DeployChaincodeNewLifecycle(network, "testchannel", orderer, chaincode)
 
 			RunQueryInvokeQuery(network, orderer, peer, 100)
@@ -286,7 +286,7 @@ var _ = Describe("Network", func() {
 			network.UpdateChannelAnchors(orderer, "testchannel")
 			network.VerifyMembership(testPeers, "testchannel")
 
-			nwo.EnableV2_0Capabilities(network, "testchannel", orderer, network.Peer("org1", "peer1"), network.Peer("org2", "peer1"))
+			nwo.EnableCapabilities(network, "testchannel", "Application", "V2_0", orderer, network.Peer("org1", "peer1"), network.Peer("org2", "peer1"))
 
 			chaincode := nwo.Chaincode{
 				Name:              "mycc",

integration/pvtdata/pvtdata_test.go

@@ -654,8 +654,8 @@ var _ bool = Describe("PrivateData", func() {
 			//
 			// collection test using _lifecycle
 			//
-			By("enabling V2_0 capabilities on the channel")
-			nwo.EnableV2_0Capabilities(network, "testchannel", orderer, peerAllThreeOrgs...)
+			By("enabling V2_0 application capabilities on the channel")
+			nwo.EnableCapabilities(network, "testchannel", "Application", "V2_0", orderer, peerAllThreeOrgs...)
 
 			By("deploying chaincode on all peers using _lifecycle. All three orgs are members of 'collectionMarbles'")
 			chaincode = nwo.Chaincode{

integration/sbe/sbe_test.go

@@ -121,10 +121,10 @@ var _ = Describe("SBE_E2E", func() {
 
 			By("updating the anchor peers")
 			network.UpdateChannelAnchors(orderer, "testchannel")
-
-			By("enabling 2.0 capabilities")
 			network.VerifyMembership(network.PeersWithChannel("testchannel"), "testchannel")
-			nwo.EnableV2_0Capabilities(network, "testchannel", orderer, network.Peer("Org1", "peer0"), network.Peer("Org2", "peer0"))
+
+			By("enabling 2.0 application capabilities")
+			nwo.EnableCapabilities(network, "testchannel", "Application", "V2_0", orderer, network.Peer("Org1", "peer0"), network.Peer("Org2", "peer0"))
 
 			By("deploying the chaincode")
 			nwo.DeployChaincodeNewLifecycle(network, "testchannel", orderer, chaincode)