[FAB-6803] Rename capabilities key V1.1 to V1_1

We are using an old version of Viper, which has problems locating
keys with period. It uses period as delimiter for the path of a
nested structure, therefore, foo.bar.V1.1 would result in
foo:
  bar:
    V1:
      1
instead of
foo:
  bar:
    V1.1:
as we expected. This patch simply renames "V1.1" to "V1_1" to avoid
this problem.

Change-Id: Iebfa5ca40038beacd2bf4ccff3639b9e5e4ce0f0
Signed-off-by: Jay Guo <guojiannan1101@gmail.com>

Author: guoger

common/capabilities/application.go

@@ -14,7 +14,7 @@ const (
 	applicationTypeName = "Application"
 
 	// ApplicationV1_1 is the capabilties string for standard new non-backwards compatible fabric v1.1 application capabilities.
-	ApplicationV1_1 = "V1.1"
+	ApplicationV1_1 = "V1_1"
 )
 
 // ApplicationProvider provides capabilities information for application level config.

common/capabilities/channel.go

@@ -15,7 +15,7 @@ const (
 	channelTypeName = "Channel"
 
 	// ChannelV1_1 is the capabilties string for standard new non-backwards compatible fabric v1.1 channel capabilities.
-	ChannelV1_1 = "V1.1"
+	ChannelV1_1 = "V1_1"
 )
 
 // ChannelProvider provides capabilities information for channel level config.

common/capabilities/orderer.go

@@ -14,7 +14,7 @@ const (
 	ordererTypeName = "Orderer"
 
 	// OrdererV1_1 is the capabilties string for standard new non-backwards compatible fabric v1.1 orderer capabilities.
-	OrdererV1_1 = "V1.1"
+	OrdererV1_1 = "V1_1"
 )
 
 // OrdererProvider provides capabilities information for orderer level config.

examples/e2e_cli/configtx.yaml

@@ -15,10 +15,14 @@
 Profiles:
 
     TwoOrgsOrdererGenesis:
+        Capabilities:
+            <<: *GlobalCapabilities
         Orderer:
             <<: *OrdererDefaults
             Organizations:
                 - *OrdererOrg
+            Capabilities:
+                <<: *OrdererCapabilities
         Consortiums:
             SampleConsortium:
                 Organizations:
@@ -31,6 +35,8 @@ Profiles:
             Organizations:
                 - *Org1
                 - *Org2
+            Capabilities:
+                <<: *ApplicationCapabilities
 
 ################################################################################
 #
@@ -151,3 +157,51 @@ Application: &ApplicationDefaults
     # Organizations is the list of orgs which are defined as participants on
     # the application side of the network
     Organizations:
+################################################################################
+#
+#   SECTION: Capabilities
+#
+#   - This section defines the capabilities of fabric network. This is a new
+#   concept as of v1.1.0 and should not be utilized in mixed networks with
+#   v1.0.x peers and orderers.  Capabilities define features which must be
+#   present in a fabric binary for that binary to safely participate in the
+#   fabric network.  For instance, if a new MSP type is added, newer binaries
+#   might recognize and validate the signatures from this type, while older
+#   binaries without this support would be unable to validate those
+#   transactions.  This could lead to different versions of the fabric binaries
+#   having different world states.  Instead, defining a capability for a channel
+#   informs those binaries without this capability that they must cease
+#   processing transactions until they have been upgraded.  For v1.0.x if any
+#   capabilities are defined (including a map with all capabilities turned off)
+#   then the v1.0.x peer will deliberately crash.
+#
+################################################################################
+Capabilities:
+    # Global capabilities apply to both the orderers and the peers and must be
+    # supported by both.  Set the value of the capability to true to require it.
+    Global: &GlobalCapabilities
+        # V1.1 for Global is a catchall flag for behavior which has been
+        # determined to be desired for all orderers and peers running v1.0.x,
+        # but the modification of which would cause imcompatibilities.  Users
+        # should leave this flag set to true.
+        V1_1: true
+
+    # Orderer capabilities apply only to the orderers, and may be safely
+    # manipulated without concern for upgrading peers.  Set the value of the
+    # capability to true to require it.
+    Orderer: &OrdererCapabilities
+        # V1.1 for Order is a catchall flag for behavior which has been
+        # determined to be desired for all orderers running v1.0.x, but the
+        # modification of which  would cause imcompatibilities.  Users should
+        # leave this flag set to true.
+        V1_1: true
+
+    # Application capabilities apply only to the peer network, and may be safely
+    # manipulated without concern for upgrading orderers.  Set the value of the
+    # capability to true to require it.
+    Application: &ApplicationCapabilities
+        # V1.1 for Application is a catchall flag for behavior which has been
+        # determined to be desired for all peers running v1.0.x, but the
+        # modification of which would cause imcompatibilities.  Users should
+        # leave this flag set to true.
+        V1_1: true

sampleconfig/configtx.yaml

@@ -319,7 +319,7 @@ Capabilities:
         # determined to be desired for all orderers and peers running v1.0.x,
         # but the modification of which would cause imcompatibilities.  Users
         # should leave this flag set to true.
-        "V1.1": true
+        V1_1: true
 
     # Orderer capabilities apply only to the orderers, and may be safely
     # manipulated without concern for upgrading peers.  Set the value of the
@@ -329,7 +329,7 @@ Capabilities:
         # determined to be desired for all orderers running v1.0.x, but the
         # modification of which  would cause imcompatibilities.  Users should
         # leave this flag set to true.
-        "V1.1": true
+        V1_1: true
 
     # Application capabilities apply only to the peer network, and may be safely
     # manipulated without concern for upgrading orderers.  Set the value of the
@@ -339,4 +339,4 @@ Capabilities:
         # determined to be desired for all peers running v1.0.x, but the
         # modification of which would cause imcompatibilities.  Users should
         # leave this flag set to true.
-        "V1.1": true
+        V1_1: true