Use the osnadmin CLI to add orderer to channel

src/api-engine/api/lib/peer/channel.py

@@ -6,25 +6,33 @@
 import subprocess
 from api.lib.peer.command import Command
 from api.config import FABRIC_TOOL, FABRIC_VERSION
+import logging
 
+LOG = logging.getLogger(__name__)
 
 class Channel(Command):
     """Call CMD to perform channel create, join and other related operations"""
 
     def __init__(self, version=FABRIC_VERSION, peer=FABRIC_TOOL, **kwargs):
         self.peer = peer + "/peer"
+        self.osnadmin = peer + "/osnadmin"
         super(Channel, self).__init__(version, **kwargs)
 
-    def create(self, channel, orderer_url, channel_tx, output_block, time_out="90s"):
+    def create(self, channel, orderer_url, block_path, time_out="90s"):
         try:
             res = 0x100
+            command = ""
+
             if os.getenv("CORE_PEER_TLS_ENABLED") == "false" or os.getenv("CORE_PEER_TLS_ENABLED") is None:
-                res = os.system("{} channel create -c {} -o {} -f {} --outputBlock {} --timeout {}"
-                                .format(self.peer, channel, orderer_url, channel_tx, output_block, time_out))
+                command = "{} channel join --channelID {} --config-block {} -o {}".format(self.osnadmin, channel, block_path, orderer_url)
             else:
                 ORDERER_CA = os.getenv("ORDERER_CA")
-                res = os.system("{} channel create -c {} -o {} -f {} --outputBlock {} --timeout {} --tls --cafile {}"
-                                .format(self.peer, channel, orderer_url, channel_tx, output_block, time_out, ORDERER_CA))
+                ORDERER_ADMIN_TLS_SIGN_CERT = os.getenv("ORDERER_ADMIN_TLS_SIGN_CERT")
+                ORDERER_ADMIN_TLS_PRIVATE_KEY = os.getenv("ORDERER_ADMIN_TLS_PRIVATE_KEY")
+                command = "{} channel join --channelID {} --config-block {} -o {} --ca-file {} --client-cert {} --client-key {}".format(self.osnadmin, channel, block_path, orderer_url, ORDERER_CA, ORDERER_ADMIN_TLS_SIGN_CERT, ORDERER_ADMIN_TLS_PRIVATE_KEY)
+
+            LOG.info(f"Running command: {command}")
+            res = os.system(command)
 
             # The return value of os.system is not the result of executing the program. It is a 16 bit number,
             #  and its high bit is the return code
@@ -106,16 +114,19 @@ def signconfigtx(self, channel_tx):
         res = res >> 8
         return res
 
-    def join(self, block_file):
+    def join(self, block_path):
         """
         Joins the peer to a channel.
         params:
-            block_file: Path to file containing genesis block.
+            block_path: Path to file containing genesis block.
         """
         try:
-            res = os.system(
-                "{} channel join -b {} ".format(self.peer, block_file)
-            )
+            command = "{} channel join -b {} ".format(self.peer, block_path)
+
+            LOG.info(f"Running command: {command}")
+
+            res = os.system(command)
+
         except Exception as e:
             err_msg = "join the peer to a channel failed. {}".format(e)
             raise Exception(err_msg)

src/api-engine/api/routes/channel/views.py

@@ -386,17 +386,26 @@ def init_env_vars(node, org):
     dir_node = "{}/{}/crypto-config/peerOrganizations".format(
         CELLO_HOME, org_name)
 
-    envs = {
-        "CORE_PEER_TLS_ENABLED": "true",
-        # "Org1.cello.comMSP"
-        "CORE_PEER_LOCALMSPID": "{}MSP".format(org_name.capitalize()),
-        "CORE_PEER_TLS_ROOTCERT_FILE": "{}/{}/peers/{}/tls/ca.crt".format(dir_node, org_name, node.name + "." + org_name),
-        "CORE_PEER_ADDRESS": "{}:{}".format(
-            node.name + "." + org_name, str(7051)),
-        "CORE_PEER_MSPCONFIGPATH": "{}/{}/users/Admin@{}/msp".format(dir_node, org_name, org_name),
-        "FABRIC_CFG_PATH": "{}/{}/peers/{}/".format(dir_node, org_name, node.name + "." + org_name),
-        "ORDERER_CA": "{}/msp/tlscacerts/tlsca.{}-cert.pem".format(dir_certificate, org_domain)
-    }
+    envs = {}
+
+    if(node.type == "orderer"):
+        envs = {
+            "ORDERER_CA": "{}/msp/tlscacerts/tlsca.{}-cert.pem".format(dir_certificate, org_domain),
+            "ORDERER_ADMIN_TLS_SIGN_CERT": "{}/orderers/{}/tls/server.crt".format(dir_certificate, node.name + "." + org_domain),
+            "ORDERER_ADMIN_TLS_PRIVATE_KEY": "{}/orderers/{}/tls/server.key".format(dir_certificate, node.name + "." + org_domain)
+        }
+    elif(node.type == "peer"):
+        envs = {
+            "CORE_PEER_TLS_ENABLED": "true",
+            "CORE_PEER_LOCALMSPID": "{}MSP".format(org_name.capitalize()),
+            "CORE_PEER_TLS_ROOTCERT_FILE": "{}/{}/peers/{}/tls/ca.crt".format(dir_node, org_name, node.name + "." + org_name),
+            "CORE_PEER_MSPCONFIGPATH": "{}/{}/users/Admin@{}/msp".format(dir_node, org_name, org_name),
+            "CORE_PEER_ADDRESS": "{}:{}".format(
+                node.name + "." + org_name, str(7051)),
+
+            "FABRIC_CFG_PATH": "{}/{}/peers/{}/".format(dir_node, org_name, node.name + "." + org_name)
+        }
+
     return envs