moved sql-related modules to new db package

inventory_provider/alarmsdb.py → inventory_provider/db/alarmsdb.py

-from inventory_provider import db
+from inventory_provider.db import db
 
 
 def get_last_known_infinera_interface_status(crs, equipment, interface):

inventory_provider/opsdb.py → inventory_provider/db/opsdb.py

-from inventory_provider import db
+from inventory_provider.db import db
 
 
 equipment_location_query = """SELECT

inventory_provider/tasks/worker.py

@@ -7,12 +7,10 @@ import redis
 from lxml import etree
 
 from inventory_provider.tasks.app import app
-from inventory_provider import alarmsdb
 from inventory_provider import config
 from inventory_provider import constants
-from inventory_provider import db
 from inventory_provider import environment
-from inventory_provider import opsdb
+from inventory_provider.db import db, opsdb, alarmsdb
 from inventory_provider import snmp
 from inventory_provider import juniper
 

test/test_alarmsdb.py

-import inventory_provider.alarmsdb as alarmsdb
+import inventory_provider.db.alarmsdb as alarmsdb
 
 
 def test_infinera_interface_status(mocker):
@@ -77,13 +77,15 @@ def test_juniper_interface_status(mocker):
 
 def test_interface_status(mocker):
     mocked_infinera = mocker.patch(
-        'inventory_provider.alarmsdb.get_last_known_infinera_interface_status')
+        'inventory_provider.db.alarmsdb'
+        '.get_last_known_infinera_interface_status')
     mocked_infinera.return_value = "unknown"
     mocked_coriant = mocker.patch(
-        'inventory_provider.alarmsdb.get_last_known_coriant_interface_status')
+        'inventory_provider.db.alarmsdb'
+        '.get_last_known_coriant_interface_status')
     mocked_coriant.return_value = "unknown"
     mocked_juniper = mocker.patch(
-        'inventory_provider.alarmsdb.'
+        'inventory_provider.db.alarmsdb.'
         'get_last_known_juniper_link_interface_status')
     mocked_juniper.return_value = "unknown"
     assert alarmsdb.get_last_known_interface_status(None, '', '') == "unknown"

test/test_opsdb.py

-import inventory_provider.opsdb
+import inventory_provider.db.opsdb
 
 
 def test_update_fields(mocker):
-    mocker.patch("inventory_provider.opsdb._juniper_field_update")
+    mocker.patch("inventory_provider"
+                 ".db.opsdb._juniper_field_update")
     t = {"manufacturer": "juniper"}
-    inventory_provider.opsdb._update_fields(t)
-    inventory_provider.opsdb._juniper_field_update.assert_called_once_with(t)
+    inventory_provider.db.opsdb._update_fields(t)
+    inventory_provider.db.opsdb \
+        ._juniper_field_update.assert_called_once_with(t)
 
-    mocker.patch("inventory_provider.opsdb._infinera_field_update")
+    mocker.patch("inventory_provider"
+                 ".db.opsdb._infinera_field_update")
     t = {"manufacturer": "infinera"}
-    inventory_provider.opsdb._update_fields(t)
-    inventory_provider.opsdb._infinera_field_update.assert_called_once_with(t)
+    inventory_provider.db.opsdb._update_fields(t)
+    inventory_provider.db.opsdb \
+        ._infinera_field_update.assert_called_once_with(t)
 
     f = {"manufacturer": "non-existent"}
-    r = inventory_provider.opsdb._update_fields(f)
+    r = inventory_provider.db.opsdb._update_fields(f)
     assert f == r
 
 
@@ -23,7 +27,7 @@ def test_infinera_field_update():
         "card_id": "tim-b-5-7",
         "port": "1"
          }
-    r = inventory_provider.opsdb._infinera_field_update(i)
+    r = inventory_provider.db.opsdb._infinera_field_update(i)
     assert r["equipment"] == "AMS01-DTNX10-1"
     assert r["interface_name"] == "1-B-5-7-1"
 
@@ -32,7 +36,7 @@ def test_infinera_field_update():
         "card_id": "tim-1/2",
         "port": "1"
          }
-    r = inventory_provider.opsdb._infinera_field_update(i)
+    r = inventory_provider.db.opsdb._infinera_field_update(i)
     assert r["equipment"] == "BUD01_CX_01"
     assert r["interface_name"] == "1/2-1"
 
@@ -41,7 +45,7 @@ def test_infinera_field_update():
         "card_id": "tim_1/2",
         "port": "1"
          }
-    r = inventory_provider.opsdb._infinera_field_update(i)
+    r = inventory_provider.db.opsdb._infinera_field_update(i)
     assert r["interface_name"] == "TIM_1/2-1"
 
 
@@ -50,50 +54,50 @@ def test_juniper_field_update():
         "interface_name": "xe-1/2",
         "logical_unit": None
          }
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-1/2"
 
     i["interface_name"] = "xe-1/2"
     i["logical_unit"] = 101
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-1/2.101"
 
     i["interface_name"] = "xe-1/2"
     i["logical_unit"] = 0
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-1/2.0"
 
     i["interface_name"] = "xe-1/2"
     i["logical_unit"] = None
     i["port"] = 0
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-1/2"
 
     i["interface_name"] = None
     i["card_id"] = "xe-2/0"
     i["logical_unit"] = None
     i["port"] = None
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-2/0"
 
     i["interface_name"] = None
     i["port"] = "0"
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-2/0/0"
 
     i["interface_name"] = None
     i["port"] = 0
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-2/0/0"
 
     i["interface_name"] = None
     i["logical_unit"] = "123"
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-2/0/0.123"
 
     i["interface_name"] = None
     i["logical_unit"] = 123
-    r = inventory_provider.opsdb._juniper_field_update(i)
+    r = inventory_provider.db.opsdb._juniper_field_update(i)
     assert r["interface_name"] == "xe-2/0/0.123"
 
 
@@ -103,7 +107,7 @@ def test_coriant_update_fields():
         "card_id": "2-3",
         "port": None
          }
-    r = inventory_provider.opsdb._coriant_field_update(i)
+    r = inventory_provider.db.opsdb._coriant_field_update(i)
     assert r["interface_name"] == "2-3"
 
     i = {
@@ -111,24 +115,24 @@ def test_coriant_update_fields():
         "card_id": "2-3",
         "port": "4"
          }
-    r = inventory_provider.opsdb._coriant_field_update(i)
+    r = inventory_provider.db.opsdb._coriant_field_update(i)
     assert r["interface_name"] == "2-3/4"
 
 
 def test_get_circuits(mocker):
-    mocker.patch("inventory_provider.opsdb.db.cursor")
+    mocker.patch("inventory_provider.db.db.cursor")
     mocked_convert_to_dict = mocker.patch(
-        "inventory_provider.opsdb._convert_to_dict")
+        "inventory_provider.db.opsdb._convert_to_dict")
     i = {"manufacturer": "infinera"}
     j = {"manufacturer": "juniper"}
     mocked_convert_to_dict.return_value = [i, j]
 
     mocked_infinera_update = mocker.patch(
-        "inventory_provider.opsdb._infinera_field_update")
+        "inventory_provider.db.opsdb._infinera_field_update")
     mocked_juniper_update = mocker.patch(
-        "inventory_provider.opsdb._juniper_field_update")
+        "inventory_provider.db.opsdb._juniper_field_update")
 
-    inventory_provider.opsdb.get_circuits(None)
+    inventory_provider.db.opsdb.get_circuits(None)
 
     mocked_infinera_update.assert_called_once_with(i)
     mocked_juniper_update.assert_called_once_with(j)