Uriziv1/csi 5997 tmp pr

Makefile

@@ -59,7 +59,8 @@ test-xunit:
 	go generate ./...
 	$(gofmt-test)
 	go vet -c=1 ./node/...
-	go test ${GO_TEST_FLAGS} ./node/... | go2xunit -output build/reports/csi-node-unitests.xml
+	go test ${GO_TEST_FLAGS} ./node/... 2>&1 > ./build/reports/test_raw.txt || true
+	cat ./build/reports/test_raw.txt | go2xunit -output build/reports/csi-node-unitests.xml
 	go test ${GO_TEST_FLAGS} ./node/...	# run again so the makefile will fail in case tests failing
 
 .PHONY: test-xunit-in-container

common/config.yaml

@@ -21,7 +21,6 @@ parameters:
     delimiter: ":"
     ids_delimiter: ";"
   node_id_info:
-    delimiter: ";"
     fcs_delimiter: ":"
 
 connectivity_type:

controllers/common/node_info.py

@@ -1,8 +1,6 @@
 from dataclasses import dataclass, field
 
-import controllers.servers.settings as servers_settings
 from controllers.array_action import settings as array_config
-from controllers.common import utils
 
 
 class NodeIdInfo:
@@ -11,16 +9,15 @@ def __init__(self, node_id):
         Args:
             node_id: <node_name>,<iqn>,<wwns>
         """
-        node_name, nvme_nqn, fc_wwns_str, iscsi_iqn = utils.get_node_id_info(node_id)
-        fc_wwns = fc_wwns_str.split(servers_settings.PARAMETERS_FC_WWN_DELIMITER)
-        self.node_name = node_name
-        self.initiators = Initiators([nvme_nqn], fc_wwns, [iscsi_iqn])
+        self.node_name = node_id
 
 
 @dataclass
 class Initiators:
     """
     Object containing node initiators (e.g. iqn, fc_wwns)
+    Usage:
+    inits = Initiators([nvme_nqn], fc_wwns, [iscsi_iqn])
     """
     nvme_nqns: list = field(default_factory=list)
     fc_wwns: list = field(default_factory=list)

controllers/common/settings.py

@@ -1,5 +1,3 @@
-from controllers.common.config import config
-
 NAME_PREFIX_SEPARATOR = "_"
 ENDPOINTS_SEPARATOR = ", "
 
@@ -11,7 +9,6 @@
 ARRAY_TYPE_DS8K = 'DS8K'
 ALL_ARRAY_TYPES = [ARRAY_TYPE_XIV, ARRAY_TYPE_SVC, ARRAY_TYPE_DS8K]
 
-PARAMETERS_NODE_ID_DELIMITER = config.parameters.node_id_info.delimiter
 SPACE_EFFICIENCY_THIN = "thin"
 SPACE_EFFICIENCY_COMPRESSED = "compressed"
 SPACE_EFFICIENCY_DEDUPLICATED = "deduplicated"

controllers/common/utils.py

@@ -7,9 +7,7 @@
 import re
 import urllib3
 
-from controllers.common import settings
 from controllers.common.csi_logger import get_stdout_logger
-from controllers.servers import messages
 
 logger = get_stdout_logger()
 
@@ -40,23 +38,6 @@ def string_to_array(str_val, separator):
     return res
 
 
-def get_node_id_info(node_id):
-    logger.debug("getting node info for node id : {0}".format(node_id))
-    split_node = node_id.split(settings.PARAMETERS_NODE_ID_DELIMITER)
-    hostname, nvme_nqn, fc_wwns, iscsi_iqn = "", "", "", ""
-    if len(split_node) == 4:
-        hostname, nvme_nqn, fc_wwns, iscsi_iqn = split_node
-    elif len(split_node) == 3:
-        hostname, nvme_nqn, fc_wwns = split_node
-    elif len(split_node) == 2:
-        hostname, nvme_nqn = split_node
-    else:
-        raise ValueError(messages.WRONG_FORMAT_MESSAGE.format("node id"))
-    logger.debug("node name : {0}, nvme_nqn: {1}, fc_wwns : {2}, iscsi_iqn : {3} ".format(
-        hostname, nvme_nqn, fc_wwns, iscsi_iqn))
-    return hostname, nvme_nqn, fc_wwns, iscsi_iqn
-
-
 def _get_workers_limit_info():
     return os.environ.get('WORKERS_LIMIT')
 

controllers/servers/csi/csi_controller_server.py

@@ -10,12 +10,13 @@
 from controllers.array_action.storage_agent import get_agent, detect_array_type
 from controllers.common.config import config as common_config
 from controllers.common.csi_logger import get_stdout_logger
-from controllers.common.node_info import NodeIdInfo
+from controllers.common.node_info import NodeIdInfo, Initiators
 from controllers.servers import messages as controller_messages
 from controllers.servers.csi.decorators import csi_method
 from controllers.servers.csi.exception_handler import handle_exception, \
     build_error_response
 from controllers.servers.errors import ObjectIdError, ValidationException, InvalidNodeId
+from controllers.servers.host_definer.kubernetes_manager.manager import KubernetesManager
 
 logger = get_stdout_logger()
 
@@ -218,8 +219,17 @@ def DeleteVolume(self, request, context):
 
         return csi_pb2.DeleteVolumeResponse()
 
+    def _get_node_initiators(self, node_id):
+        logger.info("debug - uriziv - 31")
+        kubernetes_manager = KubernetesManager()
+        k8s_node = kubernetes_manager.core_api.read_node(name=node_id)
+        ret_val = k8s_node.metadata.annotations
+        logger.info("debug - uriziv - 32")
+        return ret_val
+
     @csi_method(error_response_type=csi_pb2.ControllerPublishVolumeResponse, lock_request_attribute="volume_id")
     def ControllerPublishVolume(self, request, context):
+        logger.info("debug - uriziv - 25")
         try:
             utils.validate_publish_volume_request(request)
 
@@ -228,8 +238,12 @@ def ControllerPublishVolume(self, request, context):
             array_type = volume_id_info.array_type
             volume_id = volume_id_info.ids.uid
             node_id_info = NodeIdInfo(request.node_id)
+            logger.info(request)
             node_name = node_id_info.node_name
-            initiators = node_id_info.initiators
+            node_initiators = self._get_node_initiators(node_name)
+            logger.info("node_initiators: %s", node_initiators)
+            # TODO(uriziv1) - init Initiators object
+            initiators = Initiators(["iscsi"], ["fc1", "fc2", "fc3"], ["nvme"])
 
             logger.debug("node name for this publish operation is : {0}".format(node_name))
 
@@ -248,6 +262,7 @@ def ControllerPublishVolume(self, request, context):
             response = utils.generate_csi_publish_volume_response(lun,
                                                                   connectivity_type,
                                                                   array_initiators)
+            logger.info("debug - uriziv - 26")
             return response
 
         except array_errors.VolumeAlreadyMappedToDifferentHostsError as ex:
@@ -273,7 +288,8 @@ def ControllerUnpublishVolume(self, request, context):
             volume_id = volume_id_info.ids.uid
             node_id_info = NodeIdInfo(request.node_id)
             node_name = node_id_info.node_name
-            initiators = node_id_info.initiators
+            # TODO(uriziv1) - get initiators from nodeid
+            initiators = Initiators(["iscsi"], ["fc1", "fc2", "fc3"], ["nvme"])
             logger.debug("node name for this unpublish operation is : {0}".format(node_name))
 
             array_connection_info = utils.get_array_connection_info_from_secrets(request.secrets,

controllers/servers/csi/requirements.txt

@@ -6,6 +6,7 @@ munch==4.0.0
 retry2==0.9.5
 packaging==25.0
 base58==2.1.1
+kubernetes==33.1.0
 
 # A9000 python client
 pyxcli==1.2.1

controllers/servers/host_definer/hd_types.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass, field
 from controllers.servers.csi.controller_types import ArrayConnectionInfo
 from controllers.servers.host_definer import utils
+from controllers.common.node_info import Initiators
 
 
 @dataclass
@@ -9,6 +10,7 @@ class DefineHostRequest:
     connectivity_type_from_user: str = ''
     node_id_from_host_definition: str = ''
     node_id_from_csi_node: str = ''
+    node_initiators: Initiators = Initiators(nvme_nqns=[], fc_wwns=[], iscsi_iqns=[])
     array_connection_info: ArrayConnectionInfo = ArrayConnectionInfo(array_addresses='', user='', password='',
                                                                      partition_name='', partition_vg='', port_set='')
     io_group: str = ''

controllers/servers/host_definer/host_definer_manager.py

@@ -22,18 +22,28 @@ def __init__(self):
 
     def start_host_definition(self):
         logger.info('starting host definer')
+        logger.info("DEBUG - uriziv - 73")
         self.csi_node_watcher.add_initial_csi_nodes()
+        logger.info("DEBUG - uriziv - 74")
         self.storage_class_watcher.add_initial_storage_classes()
+        logger.info("DEBUG - uriziv - 75")
         self.node_watcher.add_initial_nodes()
+        logger.info(self.csi_node_watcher.get_nodes_var())
+        logger.info(self.csi_node_watcher.get_managed_secrets_var())
+        logger.info(self.storage_class_watcher.get_nodes_var())
+        logger.info(self.storage_class_watcher.get_managed_secrets_var())
+        logger.info("DEBUG - uriziv - 76")
         self._start_watchers()
 
     def _start_watchers(self):
+        logger.info("DEBUG - uriziv - 17")
         watchers = (
             self.csi_node_watcher.watch_csi_nodes_resources,
             self.host_definition_watcher.watch_host_definitions_resources,
             self.secret_watcher.watch_secret_resources,
             self.node_watcher.watch_nodes_resources,
             self.storage_class_watcher.watch_storage_class_resources)
+        logger.info("DEBUG - uriziv - 18")
         for watch_function in watchers:
             thread = Thread(target=watch_function,)
             thread.start()

controllers/servers/host_definer/kubernetes_manager/manager.py

@@ -1,6 +1,7 @@
 import ast
 import datetime
 import base64
+import json
 
 from kubernetes import client, config, dynamic
 from kubernetes.client import api_client
@@ -12,6 +13,8 @@
 import controllers.common.settings as common_settings
 from controllers.servers.host_definer.hd_types import (
     CsiNodeInfo, PodInfo, NodeInfo, StorageClassInfo, HostDefinitionInfo)
+from controllers.common.node_info import NodeIdInfo
+from controllers.common.node_info import Initiators
 
 logger = get_stdout_logger()
 
@@ -33,6 +36,33 @@ def _get_dynamic_client(self):
     def _load_cluster_configuration(self):
         return config.load_incluster_config()
 
+    def _get_node_ids_info(self):
+        try:
+            node_ids_info = []
+            for k8s_node in self.core_api.list_node().items:
+                k8s_node = self._generate_node_id_info(k8s_node)
+                node_ids_info.append(k8s_node)
+            return node_ids_info
+        except ApiException as ex:
+            logger.error(messages.FAILED_TO_GET_NODES.format(ex.body))
+            return []
+
+    def _get_node_id_info(self, node_name):
+        k8s_node = self._read_node(node_name)
+        logger.info("DEBUG - uriziv - 27")
+        if k8s_node:
+            return self._generate_node_id_info(k8s_node)
+        node_id_for_node_id_info_object = ';;;'
+        logger.info(node_id_for_node_id_info_object)
+        logger.info("DEBUG - uriziv - 28")
+        return NodeIdInfo(node_id_for_node_id_info_object)
+
+    def _generate_node_id_info(self, k8s_node):
+        logger.info("DEBUG - uriziv - 29")
+        node_id_for_node_id_info_object = f"{k8s_node.metadata.name};;;"
+        logger.info("DEBUG - uriziv - 30")
+        return NodeIdInfo(node_id_for_node_id_info_object)
+
     def _get_csi_nodes_api(self):
         return self.dynamic_client.resources.get(api_version=settings.STORAGE_API_VERSION,
                                                  kind=settings.CSINODE_KIND)
@@ -327,6 +357,12 @@ def _get_node_info(self, node_name):
             return self._generate_node_info(k8s_node)
         return NodeInfo('', {})
 
+    def _get_node_initiators(self, node_name):
+        k8s_node = self._read_node(node_name)
+        if k8s_node:
+            return self._generate_node_initiators(k8s_node)
+        return Initiators([], [], [])
+
     def _read_node(self, node_name):
         try:
             logger.info(messages.READ_NODE.format(node_name))
@@ -338,6 +374,17 @@ def _read_node(self, node_name):
     def _generate_node_info(self, k8s_node):
         return NodeInfo(k8s_node.metadata.name, k8s_node.metadata.labels)
 
+    def _generate_node_initiators(self, k8s_node):
+        logger.info("DEBUG - uriziv - 71")
+        logger.info(k8s_node.metadata.annotations)
+        node_initiators_raw = k8s_node.metadata.annotations.get("block.csi.ibm.com/node-ports", "{}")
+        initiators_data = json.loads(node_initiators_raw)
+        nvme_nqns = initiators_data.get("nvme", [])
+        fc_wwns = initiators_data.get("fc", [])
+        iscsi_iqns = initiators_data.get("iscsi", [])
+        logger.info("DEBUG - uriziv - 72")
+        return Initiators(nvme_nqns, fc_wwns, iscsi_iqns)
+
     def _get_csi_daemon_set(self):
         try:
             daemon_sets = self.apps_api.list_daemon_set_for_all_namespaces(label_selector=settings.DRIVER_PRODUCT_LABEL)

controllers/servers/host_definer/storage_manager/host_definer_server.py

@@ -1,23 +1,30 @@
+"""host_definer_server.py"""
+import json
+
 from controllers.array_action import settings as array_config
 from controllers.array_action.errors import HostNotFoundError, HostAlreadyExists
 from controllers.array_action.storage_agent import detect_array_type, get_agent
 from controllers.common.csi_logger import get_stdout_logger
-from controllers.common.node_info import NodeIdInfo
+from controllers.common.node_info import NodeIdInfo, Initiators
 import controllers.common.settings as common_settings
 from controllers.servers.host_definer.hd_types import DefineHostResponse
 from controllers.servers.utils import join_object_prefix_with_name, get_initiators_connectivity_type
-import controllers.servers.host_definer.settings as host_definer_settings
 from controllers.servers.host_definer import messages
+from controllers.servers.host_definer.kubernetes_manager.manager import KubernetesManager
 
 logger = get_stdout_logger()
 
 
 class HostDefinerServicer:
     def define_host(self, request):
+        logger.info("DEBUG - uriziv - 7")
+        logger.info(type(request))  # DefineHostRequest
+        logger.info(request)
+        logger.info("DEBUG - uriziv - 8")
         array_connection_info = request.array_connection_info
         array_addresses = array_connection_info.array_addresses
         node_id_info = NodeIdInfo(request.node_id_from_csi_node)
-        initiators = node_id_info.initiators
+        initiators = request.node_initiators
         node_name = node_id_info.node_name
         connectivity_type_from_user = get_initiators_connectivity_type(initiators, request.connectivity_type_from_user)
         host_name = join_object_prefix_with_name(prefix=request.prefix, name=node_name)
@@ -28,6 +35,7 @@ def define_host(self, request):
                 try:
                     initiators_from_host_definition = self._get_initiators_from_node_id(
                         request.node_id_from_host_definition)
+                    # TODO(uriziv12): consider: initiators_from_host_definition = request.node_initiators
                     found_host_name = self._get_host_name(initiators_from_host_definition, array_mediator)
                     # Partition update is first one - verifies partition can be fixed (may fail if mapped)
                     self._update_host_partition(request, found_host_name,
@@ -58,7 +66,8 @@ def undefine_host(self, request):
         node_id_info = NodeIdInfo(request.node_id_from_csi_node)
         array_connection_info = request.array_connection_info
         array_addresses = array_connection_info.array_addresses
-        initiators = node_id_info.initiators
+        # TODO(uriziv1): get initiators
+        initiators = Initiators(["iscsi"], ["fc1", "fc2", "fc3"], ["nvme"])
         node_name = node_id_info.node_name
         logger.info(messages.UNDEFINE_NODE_FROM_ARRAYS.format(node_name, array_addresses))
         try:
@@ -109,8 +118,17 @@ def _update_host_ports(self, request, host, array_mediator, partition_name):
                 raise ex
 
     def _get_initiators_from_node_id(self, node_id):
-        node_id_info = NodeIdInfo(node_id)
-        return node_id_info.initiators
+        logger.info("DEBUG - uriziv - 43")
+        # node_id_info = NodeIdInfo(node_id)
+        kubernetes_manager = KubernetesManager()
+        k8s_node = kubernetes_manager.core_api.read_node(name=node_id)
+        node_initiators_raw = k8s_node.metadata.annotations.get("block.csi.ibm.com/node-ports", "{}")
+        initiators_data = json.loads(node_initiators_raw)
+        nvme_nqns = initiators_data.get("nvme", [])
+        fc_wwns = initiators_data.get("fc", [])
+        iscsi_iqns = initiators_data.get("iscsi", [])
+        logger.info("DEBUG - uriziv - 44")
+        return Initiators(nvme_nqns, fc_wwns, iscsi_iqns)
 
     def _is_protocol_switched(self, connectivity_type_from_user, connectivity_type_from_host):
         return self._is_switching_from_nvme_to_scsi(connectivity_type_from_user, connectivity_type_from_host) or \

controllers/servers/host_definer/watcher/csi_node_watcher.py

@@ -12,10 +12,12 @@
 class CsiNodeWatcher(Watcher):
 
     def add_initial_csi_nodes(self):
+        logger.info("DEBUG - uriziv - 77")
         csi_nodes_info = self._get_csi_nodes_info_with_driver()
         for csi_node_info in csi_nodes_info:
             if self._is_host_can_be_defined(csi_node_info.name):
                 self._add_node_to_nodes(csi_node_info)
+        logger.info("DEBUG - uriziv - 78")
 
     def watch_csi_nodes_resources(self):
         while self._loop_forever():