From fc4b290ee7ece7a1026f73a0ac12bddc7471b42e Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Fri, 11 Jan 2019 08:31:51 +0000
Subject: [PATCH] Changed reference for variables, and PEP8
---
inventory_provider/routes/opsdb.py | 1 -
test/test_external_inventory_routes.py | 16 ++++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/inventory_provider/routes/opsdb.py b/inventory_provider/routes/opsdb.py
index 1fc02ffa..63e42624 100644
--- a/inventory_provider/routes/opsdb.py
+++ b/inventory_provider/routes/opsdb.py
@@ -3,7 +3,6 @@ import json
from flask import Blueprint, request, Response
from inventory_provider import db
-from inventory_provider.storage import external_inventory
routes = Blueprint("inventory-opsdb-query-routes", __name__)
diff --git a/test/test_external_inventory_routes.py b/test/test_external_inventory_routes.py
index 4adc7d58..32c72c8a 100644
--- a/test/test_external_inventory_routes.py
+++ b/test/test_external_inventory_routes.py
@@ -1,5 +1,5 @@
import json
-from inventory_provider.storage import external_inventory
+from inventory_provider.tasks import worker
DEFAULT_REQUEST_HEADERS = {
"Content-type": "application/json",
@@ -31,7 +31,7 @@ def test_get_one_equipment_location(mocker, client):
assert dummy_data == json.loads(rv.data.decode("utf-8"))
mocked_hget.assert_called_with(
- external_inventory.equipment_locations_key,
+ worker.equipment_locations_key,
"dummy-equipment"
)
@@ -48,7 +48,7 @@ def test_get_equipment_location(mocker, client):
assert rv.is_json
mocked_hgetall.assert_called_with(
- external_inventory.equipment_locations_key
+ worker.equipment_locations_key
)
@@ -64,7 +64,7 @@ def test_get_interface_info(mocker, client):
assert rv.is_json
mocked_hgetall.assert_called_with(
- external_inventory.interfaces_key
+ worker.interfaces_key
)
@@ -80,7 +80,7 @@ def test_get_interface_info_for_equipment(mocker, client):
assert rv.is_json
mocked_hscan_iter.assert_called_with(
- external_inventory.interfaces_key, "dummy-equipment::*"
+ worker.interfaces_key, "dummy-equipment::*"
)
@@ -96,7 +96,7 @@ def test_get_interface_info_for_equipment_and_interface(mocker, client):
assert rv.is_json
mocked_hget.assert_called_with(
- external_inventory.interfaces_key, "dummy-equipment::xe-2/3/1"
+ worker.interfaces_key, "dummy-equipment::xe-2/3/1"
)
@@ -112,7 +112,7 @@ def test_get_children(mocker, client):
assert rv.is_json
mocked_hget.assert_called_with(
- external_inventory.service_parent_to_children_key,
+ worker.service_parent_to_children_key,
"22987"
)
@@ -129,6 +129,6 @@ def test_get_parents(mocker, client):
assert rv.is_json
mocked_hget.assert_called_with(
- external_inventory.service_parent_to_children_key,
+ worker.service_parent_to_children_key,
"22987"
)
--
GitLab