refactor load config

Author: danielorlando97

.gitignore

@@ -2,6 +2,7 @@
 __pycache__/
 *.py[cod]
 *$py.class
+test.ipynb
 
 # C extensions
 *.so

Pipfile

@@ -7,6 +7,7 @@ name = "pypi"
 
 [dev-packages]
 autopep8 = "*"
+ipykernel = "*"
 
 [requires]
 python_version = "3.10"

Pipfile.lock

@@ -1,10 +1,4 @@
-
-
-from ast import List
-from decimal import InvalidContext
-from msilib.schema import Error
-from token import EXACT_TOKEN_TYPES
-from typing import Dict
+from typing import List, Dict
 
 
 def dict_get(_dict):
@@ -80,7 +74,7 @@ def __init__(self,
         self.credential_store = credential_store
 
     @staticmethod
-    def load(config, default_name):
+    def load(config):
         config_get = dict_get(config)
         return ClientConfig(
             organization=config_get('organization', lambda: ''),
@@ -103,6 +97,8 @@ def __init__(self, client, orgs, ca_list) -> None:
         self.orgs: OrgConfig = orgs
         self.ca_list: List[MSPConfig] = ca_list
 
+# TODO: Doc Exception
+
 
 class ConfigManager:
     def __init__(self) -> None:
@@ -116,35 +112,36 @@ def _select_network(self, name=None) -> Network:
             except KeyError:
 
                 if len(self._networks) == 1:
-                    return next(self._networks.values())
+                    return list(self._networks.values())[0]
                 else:
-                    raise Error()
+                    raise Exception()
         else:
             try:
                 return self._networks[name]
             except KeyError:
-                raise Error()
+                raise Exception()
 
     def _select_client(self, network: Network, name=None) -> ClientConfig:
         if name is None:
+            print(network.client)
             if len(network.client) == 1:
                 return network.client[0]
             else:
-                raise Error()
+                raise Exception()
         else:
             try:
                 return [client for client in network.client if client.organization == name][0]
             except KeyError:
-                raise Error()
+                raise Exception()
 
     def client_compile(self, client_name=None, network_name=None) -> ContextClient:
         network = self._select_network(network_name)
-        client = self._select_client(client_name, network)
+        client = self._select_client(network, name=client_name)
 
         try:
             org: OrgConfig = network._dict_org[client.organization]
         except KeyError:
-            raise Error()
+            raise Exception()
 
         ca_list = []
 

fabric_sdk/context/context.py

@@ -7,13 +7,21 @@
 import os
 from .context import ContextClient, ConfigManager
 
+import os
+
 
 def Context(client_name=None, network_name=None) -> ContextClient:
     config_path = os.getenv(FABRIC_PYTHON_SDK_NETWORK_CONFIG)
     manager = ConfigManager()
 
-    with open(config_path, 'r') as config_file:
-        config = config_file.read()
-        config = load(config, Loader=Loader)
+    dir_list = os.listdir(config_path)
+    dir_list = [file for file in dir_list if file.endswith('.yaml')]
+    for file in dir_list:
+        path = f'{config_path}/{file}'
+        with open(path, 'r') as config_file:
+            config = config_file.read()
+            config = load(config, Loader=Loader)
+            manager.add_new_config(path, config)
+            config_file.close()
 
     return manager.client_compile(client_name, network_name)

fabric_sdk/context/load_yaml.py

@@ -69,3 +69,31 @@ certificateAuthorities:
       enrollSecret: adminpw
     # [Optional] The optional name of the CA.
     caName: ca.org2.example.com
+
+client:
+  BCCSP:
+    security:
+      default:
+        provider: SW
+      enabled: true
+      hashAlgorithm: SHA2
+      level: 256
+      softVerify: true
+  credentialStore:
+    cryptoStore:
+      path: ../crypto-config/peerOrganizations/org1.example.com/users
+    path: ../crypto-config/peerOrganizations/org1.example.com/users
+  cryptoconfig:
+    path: ../crypto-config/peerOrganizations/org1.example.com/users
+  logging:
+    level: info
+  organization: org1
+
+organizations:
+  org1:
+    certificateAuthorities:
+      - ca.org1.example.com
+    cryptoPath: ../crypto-config/peerOrganizations/org1.example.com/msp
+    mspid: Org1MSP
+    peers:
+      - peer1.org1.com

tests/context/msp.yaml

@@ -6,9 +6,8 @@
 
 def test_load_msp():
     path = str(Path(__file__).resolve()).split('/')
-    path[-1] = 'msp.yaml'
-    os.environ[FABRIC_PYTHON_SDK_NETWORK_CONFIG] = '/'.join(path)
+    os.environ[FABRIC_PYTHON_SDK_NETWORK_CONFIG] = '/'.join(path[:-1])
 
-    context = sdk.context.init()
+    context = sdk.Context()
 
-    assert len(context.certificateAuthorities) == 3
+    assert len(context.ca_list) == 3