linstor: add network path api in linstor-manager

Add getNetworkPath, setNetworkPath and destroyNetworkPath to the linstor-manager plugin. Signed-off-by: Damien Thenot <[email protected]>
xcp-ng · Jul 26, 2024 · 8c87889 · 8c87889
1 parent 3f63f6a
commit 8c87889
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 1 deletion.
diff --git a/drivers/linstor-manager b/drivers/linstor-manager
@@ -1183,6 +1183,64 @@ def set_node_preferred_interface(session, args):
         raise XenAPIPlugin.Failure('-1', [str(e)])
     return str(True)
 
+def list_network_path(session, args):
+    group_name = args["groupName"]
+
+    linstor = LinstorVolumeManager(
+        get_controller_uri(),
+        group_name,
+        logger=util.SMlog
+    )
+    try:
+        return str(linstor.list_node_path())
+    except Exception as e:
+        raise XenAPIPlugin.Failure('-1', [str(e)])
+
+def get_network_path(session, args):
+    group_name = args["groupName"]
+    node1 = args["node1"]
+    node2 = args["node2"]
+
+    linstor = LinstorVolumeManager(
+        get_controller_uri(),
+        group_name,
+        logger=util.SMlog
+    )
+    try:
+        return str(linstor.get_node_path(node1, node2))
+    except Exception as e:
+        raise XenAPIPlugin.Failure('-1', [str(e)])
+
+def set_network_path(session, args):
+    group_name = args["groupName"]
+    hostname1 = args["node1"]
+    hostname2 = args["node2"]
+    network_name = args["network"]
+
+    linstor = LinstorVolumeManager(
+        get_controller_uri(),
+        group_name,
+        logger=util.SMlog
+    )
+    try:
+        return str(linstor.set_node_path(hostname1, hostname2, network_name))
+    except Exception as e:
+        raise XenAPIPlugin.Failure('-1', [str(e)])
+
+def destroy_network_path(session, args):
+    group_name = args["groupName"]
+    hostname1 = args["node1"]
+    hostname2 = args["node2"]
+
+    linstor = LinstorVolumeManager(
+        get_controller_uri(),
+        group_name,
+        logger=util.SMlog
+    )
+    try:
+        return str(linstor.destroy_node_path(hostname1, hostname2))
+    except Exception as e:
+        raise XenAPIPlugin.Failure('-1', [str(e)])
 
 if __name__ == '__main__':
     XenAPIPlugin.dispatch({
@@ -1238,5 +1296,10 @@ if __name__ == '__main__':
         'modifyNodeInterface': modify_node_interface,
         'listNodeInterfaces': list_node_interfaces,
         'getNodePreferredInterface': get_node_preferred_interface,
-        'setNodePreferredInterface': set_node_preferred_interface
+        'setNodePreferredInterface': set_node_preferred_interface,
+
+        'listNetworkPath': list_network_path,
+        'getNetworkPath': get_network_path,
+        'setNetworkPath': set_network_path,
+        'destroyNetworkPath': destroy_network_path
     })
diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py
@@ -46,6 +46,8 @@
 PLUGIN = 'linstor-manager'
 
 
+PATH_NAME = "xostor"
+
 # ==============================================================================
 
 def get_local_volume_openers(resource_name, volume):
@@ -1620,6 +1622,50 @@ def set_node_preferred_interface(self, node_name, name):
                 'Failed to set preferred node interface on `{}`: {}'.format(node_name, error_str)
             )
 
+    def list_node_path(self):
+        result = self._linstor.node_conn_list()
+        errors = self._filter_errors(result)
+        if errors:
+            error_str = self._get_error_str(errors)
+            raise LinstorVolumeManagerError(
+                'Failed to list node connection: {}'.format(error_str)
+            )
+        return result
+
+    def get_node_path(self, hostname1, hostname2):
+        result = self._linstor.node_conn_list_specific_pair(node_a=hostname1, node_b=hostname2)
+        errors = self._filter_errors(result)
+        if errors:
+            error_str = self._get_error_str(errors)
+            raise LinstorVolumeManagerError(
+                'Failed to get node connection for `{}` <-> `{}`: {}'.format(hostname1, hostname2, error_str)
+            )
+        return result
+
+    def set_node_path(self, hostname1, hostname2, network_name):
+        property_name1 = "Paths/{netname}/{node_name}".format(netname=PATH_NAME, node_name=hostname1)
+        property_name2 = "Paths/{netname}/{node_name}".format(netname=PATH_NAME, node_name=hostname2)
+        result = self._linstor.node_conn_modify(hostname1, hostname2, property_dict={property_name1: network_name, property_name2: network_name}, delete_props=None)
+        errors = self._filter_errors(result)
+        if errors:
+            error_str = self._get_error_str(errors)
+            raise LinstorVolumeManagerError(
+                'Failed to set node connection `{}` <-> `{}`: {}'.format(hostname1, hostname2, error_str)
+            )
+        return result
+
+    def destroy_node_path(self, hostname1, hostname2):
+        property_name1 = "Paths/{netname}/{node_name}".format(netname=PATH_NAME, node_name=hostname1)
+        property_name2 = "Paths/{netname}/{node_name}".format(netname=PATH_NAME, node_name=hostname2)
+        result = self._linstor.node_conn_modify(hostname1, hostname2, property_dict=None, delete_props=[property_name1, property_name2])
+        errors = self._filter_errors(result)
+        if errors:
+            error_str = self._get_error_str(errors)
+            raise LinstorVolumeManagerError(
+                'Failed to destroy node connection `{}` <-> `{}`: {}'.format(hostname1, hostname2, error_str)
+            )
+        return result
+
     def get_nodes_info(self):
         """
         Get all nodes + statuses, used or not by the pool.