From: ckulkarnilinux@gmail.com (Chaitanya Kulkarni)
Subject: [PATCH V2 09/46] nvmftests-nvmf: add target config generator
Date: Tue, 24 Oct 2017 18:30:26 -0700 [thread overview]
Message-ID: <1508895063-6280-10-git-send-email-ckulkarnilinux@gmail.com> (raw)
In-Reply-To: <1508895063-6280-1-git-send-email-ckulkarnilinux@gmail.com>
From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
This adds a new class to generate target configuration on
the fly. Framework will read the user configuration file and
create a target configuration JSON file on the
fly using this class.
This is useful to have a centralized configuration management.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>
---
.../nvmf/target/target_config_generator.py | 222 +++++++++++++++++++++
1 file changed, 222 insertions(+)
create mode 100644 tools/testing/selftests/nvmftests/nvmf/target/target_config_generator.py
diff --git a/tools/testing/selftests/nvmftests/nvmf/target/target_config_generator.py b/tools/testing/selftests/nvmftests/nvmf/target/target_config_generator.py
new file mode 100644
index 0000000..0da28f9
--- /dev/null
+++ b/tools/testing/selftests/nvmftests/nvmf/target/target_config_generator.py
@@ -0,0 +1,222 @@
+# Copyright (c) 2016-2017 Western Digital Corporation or its affiliates.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+# Author: Chaitanya Kulkarni <chaitanya.kulkarni at wdc.com>
+#
+""" Represents NVMe Over Fabric Target config file generator.
+"""
+
+import json
+
+
+class Port:
+ """
+ Represents target port config generator.
+
+ - Attributes:
+ - port_id : unique port identification number.
+ - port_dict : dictionary to hold port attributes.
+ - addr : to hold address attributes.
+ - referrals : list of target port referals.
+ - subsystems : list of the subsystems associated with this port.
+ """
+ def __init__(self, port_id):
+ self.port_id = port_id
+ self.port_dict = {}
+ self.addr = {}
+ self.referrals = [None]
+ self.subsystems = []
+
+ def build_addr(self):
+ """ Initialize address attributes for this port.
+ - Args :
+ - None.
+ - Returns :
+ - None.
+ """
+ self.addr['adrfam'] = ""
+ self.addr['traddr'] = ""
+ self.addr['treq'] = "not specified"
+ self.addr['trsvcid'] = ""
+ self.addr['trtype'] = "loop"
+ self.port_dict['addr'] = self.addr
+
+ def build_subsystems(self, subsys_list):
+ """ Initialize subsystem list associated with this port.
+ - Args :
+ - None.
+ -Returns :
+ - Port attributes dictionary.
+ """
+ self.subsystem = subsys_list
+ self.port_dict['subsystems'] = self.subsystem
+
+ def build_port(self, nqn_list):
+ """ Builds port addr, subsystems, id, and referrals.
+ - Args :
+ - List of the subsystem nqn associated with this port.
+ - Returns :
+ - Port dictionary with valid values.
+ """
+ self.build_addr()
+ self.build_subsystems(nqn_list)
+ self.port_dict['portid'] = self.port_id
+ self.port_dict['referrals'] = self.referrals
+ return self.port_dict
+
+
+class Subsystem:
+ """
+ Represents target subsystem config generator.
+
+ - Attributes:
+ - nr_ns : number of namespaces per subsystem.
+ - dev_list : list of block devices.
+ - nqn : subsystem nqn.
+ - ns_list : namespace list for this subsystem.
+ - allowd_hosts : allowd hosts.
+ - attr : subsystem attributes.
+ - namespace : namespace attributes.
+ - device : namespace device attibutes.
+ """
+ def __init__(self, nr_ns, nqn, dev_list):
+ self.nr_ns = nr_ns
+ self.dev_list = dev_list
+ self.nqn = nqn
+ self.ns_list = []
+ self.allowd_hosts = []
+ self.attr = {}
+ self.namespace = {}
+ self.device = {}
+ self.nguid = "00000000-0000-0000-0000-000000000000"
+
+ def add_ns(self, ns_cfg):
+ """ Updates subsystem namespace list with new namespace.
+ - Args :
+ - ns_cfg : namespace configuration.
+ - Returns :
+ - None.
+ """
+ self.allowd_hosts = []
+ self.attr = {}
+ self.namespace = {}
+ self.device = {}
+
+ self.allowd_hosts.append('hostnqn')
+ self.attr['allow_any_host'] = '1'
+ self.device['nguid'] = ns_cfg['device']['nguid']
+ self.device['path'] = ns_cfg['device']['path']
+ self.namespace['device'] = self.device
+ self.namespace['enable'] = ns_cfg['enable']
+ self.namespace['nsid'] = ns_cfg['nsid']
+ ns = self.namespace
+ self.ns_list.append(ns)
+
+ def build_ns(self):
+ """ Build namespace configuration using available devices.
+ - Args :
+ - ns_cfg : namespace configuration.
+ - Returns :
+ - None.
+ """
+ for i in range(0, self.nr_ns):
+ ns_cfg = {}
+ ns_cfg['device'] = {}
+ ns_cfg['device']['nguid'] = self.nguid
+ ns_cfg['device']['path'] = self.dev_list[i % len(self.dev_list)]
+ ns_cfg['enable'] = 1
+ ns_cfg['nsid'] = i + 1
+ self.add_ns(ns_cfg)
+
+ def build_subsys(self):
+ """ Initialize subsystem entry.
+ - Args :
+ - None.
+ - Returns :
+ - subsystem entry dictionary.
+ """
+ self.build_ns()
+ subsys_entry = {}
+ subsys_entry['allowed_hosts'] = self.allowd_hosts
+ subsys_entry['attr'] = self.attr
+ subsys_entry['namespaces'] = self.ns_list
+ subsys_entry['nqn'] = self.nqn
+ subsys = []
+ subsys.append(subsys_entry)
+ return subsys_entry
+
+
+class TargetConfig:
+ """
+ Represents target config generator.
+
+ - Attributes:
+ - subsys_list : list of subsystems associsted with this target.
+ - port_list : list of the ports associated with this target.
+ - config_file_path : path name to test config file.
+ - nr_subsys : number of subsystems present in this target.
+ - nr_ns : number of namespaces per subsystem.
+ - dev_list : list of devices to be used for namespaces.
+ """
+ def __init__(self, config_file_path, nr_subsys, nr_ns, dev_list):
+ self.subsys_list = []
+ self.port_list = []
+ self.config_file_path = config_file_path
+ self.nr_subsys = nr_subsys
+ self.nr_ns = nr_ns
+ self.dev_list = dev_list
+
+ def pp_json(self, json_string, sort=True, indents=4):
+ """ Prints formatted JSON output.
+ - Args :
+ - json_string : JSON string.
+ - sort : flag to sort JSON values before formatting.
+ - idents : identation width.
+ -Returns :
+ - formatted JSON string.
+ """
+ if type(json_string) is str:
+ return json.dumps(json.loads(json_string),
+ sort_keys=sort, indent=indents)
+ return json.dumps(json_string, sort_keys=sort, indent=indents)
+
+ def build_target_subsys(self):
+ """ Builds the Target config and dumps in JSON format.
+ - Args :
+ - None.
+ - Returns :
+ - None.
+ """
+ nqn_list = []
+ subsys_list = []
+ port_list = []
+ for i in range(0, self.nr_subsys):
+ nqn = "testnqn" + str(i + 1)
+ subsys = Subsystem(self.nr_ns, nqn, self.dev_list)
+ subsys_list.append(subsys.build_subsys())
+ nqn_list.append(nqn)
+
+ # TODO : improve support for multiple ports
+ p = Port(1)
+ port_list.append(p.build_port(nqn_list))
+
+ target_config_str = {}
+ target_config_str['ports'] = port_list
+ target_config_str['subsystems'] = subsys_list
+ data = self.pp_json(target_config_str)
+ with open(self.config_file_path, "w+") as config_file:
+ config_file.write(data)
--
1.8.3.1
next prev parent reply other threads:[~2017-10-25 1:30 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-25 1:30 [PATCH V2 00/46] nvmftests: NVMe Over Fabrics Unit Test Framework Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 01/46] nvmftests: add nvmftests README file Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 02/46] nvmftests-utils: add utility class to define constants Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 03/46] nvmftests-utils: add shell command package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 04/46] nvmftests-utils: add log package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 05/46] nvmftests-utils: add diskio package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 06/46] nvmftests-utils: add fs package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 07/46] nvmftests-utils: add misc package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 08/46] nvmftests: add utils package Chaitanya Kulkarni
2017-10-25 1:30 ` Chaitanya Kulkarni [this message]
2017-10-25 1:30 ` [PATCH V2 10/46] nvmftests-nvmf: add support for target ns Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 11/46] nvmftests-nvmf: add support for target port Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 12/46] nvmftests-nvmf: add support for target subsystem Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 13/46] nvmftests-nvmf: add support for target Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 14/46] nvmftests-nvmf: add target package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 15/46] nvmftests-nvmf: add support for host ns Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 16/46] nvmftests-nvmf: add support for host subsystem Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 17/46] nvmftests-nvmf: add support for host Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 18/46] nvmftests-nvmf: add host package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 19/46] nvmftests-nvmf: add nvmf core package Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 20/46] nvmftests-tests: add user config file Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 21/46] nvmftests-tests: add support for test logger Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 22/46] nvmftests-tests: add a parent class for tests Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 23/46] nvmftests-tests: add a test for generic block device Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 24/46] nvmftests-tests: add a test for ns-descs Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 25/46] nvmftests-tests: add a test for create/delete host Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 26/46] nvmftests-tests: add a test for NVMe PCIe target ns Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 27/46] nvmftests-tests: add a test to create and delete target Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 28/46] nvmftests-tests: add a test for controller rescan Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 29/46] nvmftests-tests: add a test for controller reset Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 30/46] nvmftests-tests: add a test for get-ns-id Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 31/46] nvmftests-tests: add a test for identify controller Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 32/46] nvmftests-tests: add a test for identify namespace Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 33/46] nvmftests-tests: add a test for smart-log Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 34/46] nvmftests-tests: add a test to run IOs with dd Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 35/46] nvmftests-tests: add a test to run IOs parallely " Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 36/46] nvmftests-tests: add a test to run mkfs and fio Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 37/46] nvmftests-tests: add a test to enable/disable target ns Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 38/46] nvmftests-tests: add a test to run IOs with dd randomly Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 39/46] nvmftests-tests: add a test to scan host ctrls and ns Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 40/46] nvmftests-tests: add a test to scan target subsys/ns Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 41/46] nvmftests-tests: add a target template Chaitanya Kulkarni
2017-10-25 1:30 ` [PATCH V2 42/46] nvmftests-tests: add a host template Chaitanya Kulkarni
2017-10-25 1:31 ` [PATCH V2 43/46] nvmftests-tests: add a test to run traffic and disable ns Chaitanya Kulkarni
2017-10-25 1:31 ` [PATCH V2 44/46] nvmftests-tests: add a test to measure perf with fio Chaitanya Kulkarni
2017-10-25 1:31 ` [PATCH V2 45/46] nvmftests: add class documentation and sequence diagram Chaitanya Kulkarni
2017-10-25 1:31 ` [PATCH V2 46/46] nvmftests: add Makefile Chaitanya Kulkarni
2017-10-25 7:30 ` [PATCH V2 00/46] nvmftests: NVMe Over Fabrics Unit Test Framework Johannes Thumshirn
2018-02-21 13:00 ` Michael Moese
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1508895063-6280-10-git-send-email-ckulkarnilinux@gmail.com \
--to=ckulkarnilinux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).