Merge pull request #683 from H-ario-m/fix-677-node-selection

Fix chaincode installation to use selected node ID

Author: yeasy

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

@@ -6,7 +6,10 @@
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 import os
-import tempfile, shutil, tarfile, json
+import tempfile
+import shutil
+import tarfile
+import json
 
 from drf_yasg.utils import swagger_auto_schema
 from api.config import FABRIC_CHAINCODE_STORE
@@ -35,8 +38,10 @@
 import hashlib
 import logging
 
+
 LOG = logging.getLogger(__name__)
 
+
 class ChainCodeViewSet(viewsets.ViewSet):
     """Class represents Channel related operations."""
     permission_classes = [IsAuthenticated, ]
@@ -52,13 +57,19 @@ def _read_cc_pkg(self, pk, filename, ccpackage_path):
             meta_path = os.path.join(ccpackage_path, "metadata.json")
             # extract metadata file
             with tarfile.open(os.path.join(ccpackage_path, filename)) as tared_file:
-                metadata_file = tared_file.getmember("metadata.json")
-                tared_file.extract(metadata_file, path=ccpackage_path)
-
-            with open(meta_path, 'r') as f:
-                metadata = json.load(f)
-                language = metadata["type"]
-                label = metadata["label"]
+                metadata_file = None
+                for member in tared_file.getmembers():
+                    if member.name.endswith("metadata.json"):
+                        metadata_file = member
+                        break
+
+                if metadata_file is not None:
+                    # Extract the metadata file
+                    metadata_content = tared_file.extractfile(
+                        metadata_file).read().decode("utf-8")
+                    metadata = json.loads(metadata_content)
+                    language = metadata["type"]
+                    label = metadata["label"]
 
             if os.path.exists(meta_path):
                 os.remove(meta_path)
@@ -111,7 +122,10 @@ def list(self, request):
                 ]
                 response = ChaincodeListResponse(
                     {"data": chanincodes_list, "total": chaincodes.count()})
-                return Response(data=ok(response.data), status=status.HTTP_200_OK)
+                return Response(
+                    data=ok(
+                        response.data),
+                    status=status.HTTP_200_OK)
             except Exception as e:
                 return Response(
                     err(e.args), status=status.HTTP_400_BAD_REQUEST
@@ -145,22 +159,23 @@ def package(self, request):
                         if member.name.endswith("metadata.json"):
                             metadata_file = member
                             break
-                    
+
                     if metadata_file is not None:
                         # Extract the metadata file
-                        metadata_content = tar.extractfile(metadata_file).read().decode("utf-8")
+                        metadata_content = tar.extractfile(
+                            metadata_file).read().decode("utf-8")
                         metadata = json.loads(metadata_content)
                         label = metadata.get("label")
                     else:
                         return Response(
-                            err("Metadata file not found in the chaincode package."), status=status.HTTP_400_BAD_REQUEST
-                        )
+                            err("Metadata file not found in the chaincode package."),
+                            status=status.HTTP_400_BAD_REQUEST)
 
                 org = request.user.organization
                 # qs = Node.objects.filter(type="peer", organization=org)
                 # if not qs.exists():
                 #     return Response(
-                #         err("at least 1 peer node is required for the chaincode package upload."), 
+                #         err("at least 1 peer node is required for the chaincode package upload."),
                 #         status=status.HTTP_400_BAD_REQUEST
                 #     )
                 # peer_node = qs.first()
@@ -169,7 +184,7 @@ def package(self, request):
                 # return_code, content = peer_channel_cli.lifecycle_calculatepackageid(temp_cc_path)
                 # if (return_code != 0):
                 #     return Response(
-                #         err("calculate packageid failed for {}.".format(content)), 
+                #         err("calculate packageid failed for {}.".format(content)),
                 #         status=status.HTTP_400_BAD_REQUEST
                 #     )
                 # packageid = content.strip()
@@ -185,7 +200,7 @@ def package(self, request):
                 cc = ChainCode.objects.filter(package_id=packageid)
                 if cc.exists():
                     return Response(
-                        err("package with id {} already exists.".format(packageid)), 
+                        err("package with id {} already exists.".format(packageid)),
                         status=status.HTTP_400_BAD_REQUEST
                     )
 
@@ -206,8 +221,9 @@ def package(self, request):
 
                 # start thread to read package meta info, update db
                 try:
-                    threading.Thread(target=self._read_cc_pkg,
-                                        args=(uuid, file.name, ccpackage_path)).start()
+                    threading.Thread(
+                        target=self._read_cc_pkg,
+                        args=(uuid, file.name, ccpackage_path)).start()
                 except Exception as e:
                     LOG.exception("Failed Threading")
                     raise e
@@ -231,6 +247,8 @@ def package(self, request):
     @action(detail=False, methods=['post'])
     def install(self, request):
         chaincode_id = request.data.get("id")
+        # Get the selected node ID from request
+        node_id = request.data.get("node")
         try:
             cc_targz = ""
             file_path = os.path.join(FABRIC_CHAINCODE_STORE, chaincode_id)
@@ -239,16 +257,31 @@ def install(self, request):
                 break
 
             org = request.user.organization
-            qs = Node.objects.filter(type="peer", organization=org)
-            if not qs.exists():
-                raise ResourceNotFound("Peer Does Not Exist")
-            peer_node = qs.first()
+
+            # If node_id is provided, get that specific node
+            if node_id:
+                try:
+                    peer_node = Node.objects.get(
+                        id=node_id, type="peer", organization=org)
+                except Node.DoesNotExist:
+                    return Response(
+                        err("Selected peer node not found or not authorized."),
+                        status=status.HTTP_404_NOT_FOUND
+                    )
+            else:
+                # Fallback to first peer if no node selected
+                qs = Node.objects.filter(type="peer", organization=org)
+                if not qs.exists():
+                    raise ResourceNotFound
+                peer_node = qs.first()
 
             envs = init_env_vars(peer_node, org)
             peer_channel_cli = PeerChainCode(**envs)
             res = peer_channel_cli.lifecycle_install(cc_targz)
             if res != 0:
-                return Response(err("install chaincode failed."), status=status.HTTP_400_BAD_REQUEST)
+                return Response(
+                    err("install chaincode failed."),
+                    status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
             return Response(
                 err(e.args), status=status.HTTP_400_BAD_REQUEST

src/dashboard/src/pages/ChainCode/forms/InstallForm.js

@@ -1,3 +1,6 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ */
 import React, { useState, useEffect } from 'react';
 import { injectIntl, useIntl } from 'umi';
 import { Modal, message, Select, Form, Tag, Input } from 'antd';
@@ -23,7 +26,15 @@ const InstallForm = props => {
   useEffect(() => {
     async function fecthData() {
       const response = await listNode();
-      setNodes(response.data.data.map(node => ({ label: node.name, value: node.id })));
+      // Filter out orderer nodes, only allow peer nodes for chaincode installation
+      setNodes(
+        response.data.data
+          .filter(node => node.type === 'peer')
+          .map(node => ({
+            label: node.name,
+            value: node.id,
+          }))
+      );
     }
     fecthData();
   }, []);