Merge pull request #327 from tianxuanhong/issue-#326

[#issue-326] cmdlinelib feature of approveformyorg && queryapproved f…

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

@@ -10,16 +10,17 @@ def __init__(self, version="2.2.0", peer=FABRIC_TOOL, **kwargs):
         self.peer = peer + "/peer"
         super(ChainCode, self).__init__(version, **kwargs)
 
-    def lifecycle_package(self, cc_name, cc_path, language, label):
+    def lifecycle_package(self, cc_name, cc_version, cc_path, language):
         """
             package the chaincode to a tar.gz file.
         :param cc_name: chaincode name
+        :param cc_version: chaincode version
         :param cc_path: where the chaincode is
         :param language: Chain code development language, default: golang
-        :param label: Label of the generated chain code package
         :return 0 means success.
         """
         try:
+            label = cc_name+"_"+cc_version
             res = os.system("{} lifecycle chaincode package {}.tar.gz --path {} --lang {} --label {}"
                             .format(self.peer, cc_name, cc_path, language, label))
             res = res >> 8
@@ -94,3 +95,69 @@ def lifecycle_get_installed_package(self, timeout):
             raise Exception(err_msg)
         return res_return
 
+    def lifecycle_approve_for_my_org(self, orderer_url, orderer_tls_rootcert, channel_name, cc_name,
+                                     chaincode_version, policy):
+        """
+        The administrator can use the peer lifecycle chaincode approveformyorg subcommand to approve the chain code on
+        behalf of the organization.
+        :param orderer_url: orderer accessable url
+        :param orderer_tls_rootcert: orderer tls certificate
+        :param channel_name: channel name
+        :param cc_name: chaincode name
+        :param chaincode_version: chaincode version
+        :param policy: chaincode policy
+        :return:
+        """
+        res, installed = self.lifecycle_query_installed("3s")
+        cc_label = cc_name+"_"+chaincode_version
+        package_id = ""
+        for each in installed['installed_chaincodes']:
+            if each['label'] == cc_label:
+                package_id = each['package_id']
+                break
+        if package_id == "":
+            return 1, "not exist the chaincode, please check chaincode_name and chaincode_version"
+
+        if os.getenv("CORE_PEER_TLS_ENABLED") == "false" or os.getenv("CORE_PEER_TLS_ENABLED") is None:
+            res = subprocess.Popen("{} lifecycle chaincode approveformyorg -o {} - --channelID {} --name {} "
+                                   "--version {} --init-required --package-id {} --sequence 1 --signature-policy {}"
+                                   .format(self.peer, orderer_url, channel_name, cc_name, chaincode_version, package_id,
+                                           policy), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        else:
+            res = subprocess.Popen("{} lifecycle chaincode approveformyorg -o {} --tls --cafile {} --channelID {} "
+                                   "--name {} --version {} --init-required --package-id {} --sequence 1 "
+                                   "--signature-policy {}"
+                                   .format(self.peer, orderer_url, orderer_tls_rootcert, channel_name,
+                                           cc_name, chaincode_version, package_id, policy), shell=True,
+                                   stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = res.communicate()
+        return_code = res.returncode
+
+        if return_code == 0:
+            content = str(stdout, encoding="utf-8")
+        else:
+            stderr = str(stderr, encoding="utf-8")
+            return return_code, stderr
+        return return_code, content
+
+    def lifecycle_query_approved(self, channel_name, cc_name):
+        """
+         query_approved chaincode information.
+        :param channel_name: channel name
+        :param cc_name: chaincode name
+        :return:
+        """
+
+        res = subprocess.Popen("{} lifecycle chaincode queryapproved --output json --channelID {}"
+                               " --name {}".format(self.peer, channel_name, cc_name),
+                               shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = res.communicate()
+        return_code = res.returncode
+        if return_code == 0:
+            content = str(stdout, encoding="utf-8")
+            chaincodes_info = json.loads(content)
+        else:
+            stderr = str(stderr, encoding="utf-8")
+            return return_code, stderr
+
+        return return_code, chaincodes_info