Skip to content
Snippets Groups Projects
Commit 764226b2 authored by Erik Reid's avatar Erik Reid
Browse files

fixed overwritten data key

parent 9b0ab276
No related branches found
No related tags found
No related merge requests found
...@@ -63,8 +63,8 @@ if __name__ == "__main__": ...@@ -63,8 +63,8 @@ if __name__ == "__main__":
with open("config.json") as f: with open("config.json") as f:
params = config.load(f) params = config.load(f)
# update_network_details(params) update_network_details(params)
network_info = load_network_details(params["redis"]) # network_info = load_network_details(params["redis"])
with open("./router-info.json", "w") as f: # with open("./router-info.json", "w") as f:
f.write(json.dumps(network_info)) # f.write(json.dumps(network_info))
import json import json
import logging
from celery import bootsteps, Task from celery import bootsteps, Task
import redis import redis
...@@ -6,11 +7,13 @@ import redis ...@@ -6,11 +7,13 @@ import redis
from inventory_provider.tasks.app import app from inventory_provider.tasks.app import app
from inventory_provider import config from inventory_provider import config
from inventory_provider import juniper, snmp from inventory_provider import juniper, snmp
from inventory_provider import constants
class InventoryTask(Task): class InventoryTask(Task):
config = None config = None
logger = None
def __init__(self): def __init__(self):
pass pass
...@@ -24,6 +27,8 @@ class InventoryTask(Task): ...@@ -24,6 +27,8 @@ class InventoryTask(Task):
name=hostname, name=hostname,
key=key, key=key,
value=json.dumps(data)) value=json.dumps(data))
InventoryTask.logger.debug(
"saved %s, key %s" % (hostname, key))
return "OK" return "OK"
...@@ -31,6 +36,7 @@ class WorkerArgs(bootsteps.Step): ...@@ -31,6 +36,7 @@ class WorkerArgs(bootsteps.Step):
def __init__(self, worker, config_filename, **options): def __init__(self, worker, config_filename, **options):
with open(config_filename) as f: with open(config_filename) as f:
InventoryTask.config = config.load(f) InventoryTask.config = config.load(f)
InventoryTask.logger = logging.getLogger(constants.TASK_LOGGER_NAME)
def worker_args(parser): def worker_args(parser):
...@@ -74,7 +80,7 @@ def juniper_refresh_interfaces(self, hostname): ...@@ -74,7 +80,7 @@ def juniper_refresh_interfaces(self, hostname):
def snmp_refresh_interfaces(self, hostname, community): def snmp_refresh_interfaces(self, hostname, community):
InventoryTask.save_key( InventoryTask.save_key(
hostname, hostname,
"interfaces", "snmp-interfaces",
list(snmp.get_router_interfaces( list(snmp.get_router_interfaces(
hostname, hostname,
community, community,
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment