From 69619552720f2ab09ff03de6521ad8b54edc87ae Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sat, 20 Apr 2024 23:33:25 +0200
Subject: [PATCH] More shuffling...

---
 TODO                      |  1 +
 example/__init__.py       |  4 +++-
 nsc/__init__.py           |  3 ---
 nsconfig/__init__.py      |  3 +++
 nsconfig/cli.py           | 20 ++++++++++++++++++++
 {nsc => nsconfig}/core.py |  0
 test.py                   |  5 ++---
 7 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100755 nsc/__init__.py
 create mode 100755 nsconfig/__init__.py
 create mode 100644 nsconfig/cli.py
 rename {nsc => nsconfig}/core.py (100%)

diff --git a/TODO b/TODO
index 47dcca2..aa85749 100644
--- a/TODO
+++ b/TODO
@@ -1,2 +1,3 @@
 - Names with dots
 - Classless reverse delegation
+- Blackhole zones
diff --git a/example/__init__.py b/example/__init__.py
index 20e7905..8309b1b 100644
--- a/example/__init__.py
+++ b/example/__init__.py
@@ -1,4 +1,4 @@
-from nsc import Nsc
+from nsconfig import Nsc
 
 nsc = Nsc(
     admin_email='admin@example.org',
@@ -8,3 +8,5 @@ nsc = Nsc(
 for rev in ['10.1.0.0/16', '10.2.0.0/16', 'fd12:3456:789a::/48']:
     rz = nsc.add_reverse_zone(rev)
     rz[""].NS(['ns1.example.org', 'ns2.example.org'])
+
+import example.example_org
diff --git a/nsc/__init__.py b/nsc/__init__.py
deleted file mode 100755
index e5376d2..0000000
--- a/nsc/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from nsc.core import Nsc, NscZone, NscZoneConfig, NscNode
-
-pass
diff --git a/nsconfig/__init__.py b/nsconfig/__init__.py
new file mode 100755
index 0000000..cb3c32e
--- /dev/null
+++ b/nsconfig/__init__.py
@@ -0,0 +1,3 @@
+from nsconfig.core import Nsc, NscZone, NscZoneConfig, NscNode
+
+pass
diff --git a/nsconfig/cli.py b/nsconfig/cli.py
new file mode 100644
index 0000000..ae3e976
--- /dev/null
+++ b/nsconfig/cli.py
@@ -0,0 +1,20 @@
+import argparse
+
+from nsconfig.core import Nsc
+
+
+def do_test(nsc: Nsc) -> None:
+    nsc.fill_reverse()
+    nsc.dump()
+
+
+def main(nsc: Nsc) -> None:
+    parser = argparse.ArgumentParser(description='Configure name server')
+    subparsers = parser.add_subparsers(help='action to perform', dest='action', required=True, metavar='ACTION')
+
+    test_parser = subparsers.add_parser('test', help='test new configuration', description='Test new configuration')
+
+    args = parser.parse_args()
+
+    if args.action == 'test':
+        do_test(nsc)
diff --git a/nsc/core.py b/nsconfig/core.py
similarity index 100%
rename from nsc/core.py
rename to nsconfig/core.py
diff --git a/test.py b/test.py
index d6ea688..a1be5d9 100755
--- a/test.py
+++ b/test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 from example import nsc
-import example.example_org
+import nsconfig.cli
 
-nsc.fill_reverse()
-nsc.dump()
+nsconfig.cli.main(nsc)
-- 
2.39.2