FAB2044: Allow OUs to be contained in MSP description

This change-sets does the following: 1. Addresses point A) of the JIRA item by modifying the involved protobufs JIRA: https://jira.hyperledger.org/browse/FAB-2400 Change-Id: I94717ac1842875ed9520e2dd062bd533f68554a5 Signed-off-by: Angelo De Caro <[email protected]>
hyperledger · Feb 23, 2017 · fc62148 · fc62148
1 parent f145efe
commit fc62148
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 50 deletions.
diff --git a/protos/common/msp_principal.pb.go b/protos/common/msp_principal.pb.go
diff --git a/protos/common/msp_principal.proto b/protos/common/msp_principal.proto
@@ -87,10 +87,13 @@ message OrganizationUnit {
     // refers to
     string msp_identifier = 1;
 
-    // OrganizationUnitIdentifier defines the organization unit under the
+    // OrganizationUnitIdentifier defines the organizational unit under the
     // MSP identified with MSPIdentifier
     string organizational_unit_identifier = 2;
 
+    // CertifiersIdentifier is the hash of certificates chain of trust
+    // related to this organizational unit
+    bytes certifiers_identifier = 3;
 }
 
 // MSPRole governs the organization of the Principal

diff --git a/protos/msp/mspconfig.pb.go b/protos/msp/mspconfig.pb.go
diff --git a/protos/msp/mspconfig.proto b/protos/msp/mspconfig.proto
@@ -73,6 +73,11 @@ message FabricMSPConfig {
     // this peer is to use, and which is to be imported by the
     // MSP defined before
     SigningIdentityInfo signing_identity = 6;
+
+    // OrganizationalUnitIdentifiers holds one or more
+    // fabric organizational unit identifiers that belong to
+    // this MSP configuration
+    repeated FabricOUIdentifier organizational_unit_identifiers = 7;
 }
 
 // SigningIdentityInfo represents the configuration information
@@ -103,3 +108,16 @@ message KeyInfo {
     // properly encoded key bytes, prefixed by the type of the key
     bytes key_material = 2;
 }
+
+// FabricOUIdentifier represents an organizazional unit and
+// its related chain of trust identifier.
+message FabricOUIdentifier {
+
+    // CertifiersIdentifier is the hash of certificates chain of trust
+    // related to this organizational unit
+    bytes certifiers_identifier = 1;
+
+    // OrganizationUnitIdentifier defines the organizational unit under the
+    // MSP identified with MSPIdentifier
+    string organizational_unit_identifier = 2;
+}