[FAB-4465] Expose orderer orgs via config

Although the config carries information about the orderer orgs, there is
currently no interface to access them, like there is for the application
orgs.

This CR simply adds an accessor method for the orderer orgs.

Change-Id: I32b726997edf5d0183805c0b0c768f98a8f80c63
Signed-off-by: Jason Yellick <[email protected]>

Author: Jason Yellick

common/config/api.go

@@ -93,6 +93,9 @@ type Orderer interface {
 	// Kafka brokers, i.e. this is not necessarily the entire set of Kafka brokers
 	// used for ordering
 	KafkaBrokers() []string
+
+	// Organizations returns the organizations for the ordering service
+	Organizations() map[string]Org
 }
 
 type ValueProposer interface {

common/config/orderer.go

@@ -89,6 +89,7 @@ type OrdererConfig struct {
 	*standardValues
 	protos       *OrdererProtos
 	ordererGroup *OrdererGroup
+	orgs         map[string]Org
 
 	batchTimeout time.Duration
 }
@@ -140,6 +141,11 @@ func (oc *OrdererConfig) MaxChannelsCount() uint64 {
 	return oc.protos.ChannelRestrictions.MaxCount
 }
 
+// Organizations returns a map of the orgs in the channel
+func (oc *OrdererConfig) Organizations() map[string]Org {
+	return oc.orgs
+}
+
 func (oc *OrdererConfig) Validate(tx interface{}, groups map[string]ValueProposer) error {
 	for _, validator := range []func() error{
 		oc.validateConsensusType,
@@ -152,6 +158,15 @@ func (oc *OrdererConfig) Validate(tx interface{}, groups map[string]ValuePropose
 		}
 	}
 
+	var ok bool
+	oc.orgs = make(map[string]Org)
+	for key, value := range groups {
+		oc.orgs[key], ok = value.(*OrganizationGroup)
+		if !ok {
+			return fmt.Errorf("Organization sub-group %s was not an OrgGroup, actually %T", key, value)
+		}
+	}
+
 	return nil
 }
 

common/mocks/config/orderer.go

@@ -19,6 +19,7 @@ package config
 import (
 	"time"
 
+	"github.com/hyperledger/fabric/common/config"
 	ab "github.com/hyperledger/fabric/protos/orderer"
 )
 
@@ -34,6 +35,8 @@ type Orderer struct {
 	KafkaBrokersVal []string
 	// MaxChannelsCountVal is returns as the result of MaxChannelsCount()
 	MaxChannelsCountVal uint64
+	// OrganizationsVal is returned as the result of Organizations()
+	OrganizationsVal map[string]config.Org
 }
 
 // ConsensusType returns the ConsensusTypeVal
@@ -60,3 +63,8 @@ func (scm *Orderer) KafkaBrokers() []string {
 func (scm *Orderer) MaxChannelsCount() uint64 {
 	return scm.MaxChannelsCountVal
 }
+
+// Organizations returns OrganizationsVal
+func (scm *Orderer) Organizations() map[string]config.Org {
+	return scm.OrganizationsVal
+}