[FAB-15386] profile can specify chan capabilities

Change-Id: I64d8439172861ec4f2e3280c11c849250f8e08bc
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

integration/nwo/configtx_template.go

@@ -54,7 +54,7 @@ Organizations:{{ range .PeerOrgs }}
 Channel: &ChannelDefaults
   Capabilities:
     V2_0: true
-  Policies:
+  Policies: &DefaultPolicies
     Readers:
       Type: ImplicitMeta
       Rule: ANY Readers
@@ -67,7 +67,15 @@ Channel: &ChannelDefaults
 
 Profiles:{{ range .Profiles }}
   {{ .Name }}:
+    {{- if .ChannelCapabilities}}
+    Capabilities:{{ range .ChannelCapabilities}}
+      {{ . }}: true
+    {{- end}}
+    Policies:
+      <<: *DefaultPolicies
+    {{- else }}
     <<: *ChannelDefaults
+    {{- end}}
     {{- if .Orderers }}
     Orderer:
       OrdererType: {{ $w.Consensus.Type }}

integration/nwo/network.go

@@ -121,11 +121,12 @@ func (p *Peer) Anchor() bool {
 
 // A profile encapsulates basic information for a configtxgen profile.
 type Profile struct {
-	Name            string   `yaml:"name,omitempty"`
-	Orderers        []string `yaml:"orderers,omitempty"`
-	Consortium      string   `yaml:"consortium,omitempty"`
-	Organizations   []string `yaml:"organizations,omitempty"`
-	AppCapabilities []string `yaml:"appcapabilities,omitempty"`
+	Name                string   `yaml:"name,omitempty"`
+	Orderers            []string `yaml:"orderers,omitempty"`
+	Consortium          string   `yaml:"consortium,omitempty"`
+	Organizations       []string `yaml:"organizations,omitempty"`
+	AppCapabilities     []string `yaml:"app_capabilities,omitempty"`
+	ChannelCapabilities []string `yaml:"channel_capabilities,omitempty"`
 }
 
 // Network holds information about a fabric network.