IDEV-1877: Refactor nad and nod implementation.

Author: jbabac

domaintools/api.py

@@ -1120,22 +1120,30 @@ def iris_detect_ignored_domains(
             **kwargs,
         )
 
-    def newly_observed_domains_feed(self, **kwargs):
+    def nod(self, **kwargs):
         """Returns back list of the newly observed domains feed"""
+        sessionID = kwargs.get("sessionID")
+        after = kwargs.get("after")
+        if (sessionID and after) or not (sessionID or after):
+            raise ValueError("sessionID or after (but not both) must be defined")
+
         return self._results(
             "newly-observed-domains-feed-(api)",
             "v1/feed/nod/",
             response_path=(),
-            after="-60",
             **kwargs,
         )
 
-    def newly_active_domains_feed(self, **kwargs):
+    def nad(self, **kwargs):
         """Returns back list of the newly active domains feed"""
+        sessionID = kwargs.get("sessionID")
+        after = kwargs.get("after")
+        if (sessionID and after) or not (sessionID or after):
+            raise ValueError("sessionID or after (but not both) must be defined")
+
         return self._results(
             "newly-active-domains-feed-(api)",
             "v1/feed/nad/",
             response_path=(),
-            after="-60",
             **kwargs,
         )

domaintools/cli/commands/feeds.py

@@ -48,6 +48,21 @@ def feeds_nad(
         "--no-sign-api-key",
         help="Skip signing of api key",
     ),
+    sessionID: str = typer.Option(
+        None,
+        "--session-id",
+        help="Unique identifier for the session",
+    ),
+    after: str = typer.Option(
+        None,
+        "--after",
+        help="Start of the time window, relative to the current time in seconds, for which data will be provided",
+    ),
+    top: str = typer.Option(
+        None,
+        "--top",
+        help="Number of results to return in the response payload",
+    ),
 ):
     DTCLICommand.run(name=c.FEEDS_NAD, params=ctx.params)
 
@@ -92,5 +107,20 @@ def feeds_nod(
         "--no-sign-api-key",
         help="Skip signing of api key",
     ),
+    sessionID: str = typer.Option(
+        None,
+        "--session-id",
+        help="Unique identifier for the session",
+    ),
+    after: str = typer.Option(
+        None,
+        "--after",
+        help="Start of the time window, relative to the current time in seconds, for which data will be provided",
+    ),
+    top: str = typer.Option(
+        None,
+        "--top",
+        help="Number of results to return in the response payload",
+    ),
 ):
     DTCLICommand.run(name=c.FEEDS_NOD, params=ctx.params)

domaintools/cli/constants.py

@@ -43,5 +43,5 @@
 PHISHEYE_TERM_LIST = "phisheye_term_list"
 
 # feeds
-FEEDS_NAD = "newly_active_domains_feed"
-FEEDS_NOD = "newly_observed_domains_feed"
+FEEDS_NAD = "nad"
+FEEDS_NOD = "nod"

tests/test_api.py

@@ -517,7 +517,7 @@ def test_limit_exceeded():
 
 @vcr.use_cassette
 def test_newly_observed_domains_feed():
-    results = api.newly_observed_domains_feed()
+    results = api.nod(after="-60")
     response = results.response()
     rows = response.strip().split("\n")
 
@@ -533,7 +533,7 @@ def test_newly_observed_domains_feed():
 
 @vcr.use_cassette
 def test_newly_active_domains_feed():
-    results = api.newly_active_domains_feed()
+    results = api.nad(after="-60")
     response = results.response()
     rows = response.strip().split("\n")