Merge pull request #485 from cglewis/master

defaults for config and log files; bump version

Author: cglewis

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2017 In-Q-Tel, Inc, All Rights Reserved.
+Copyright (c) 2016-2018 In-Q-Tel, Inc, All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

VERSION

@@ -1 +1 @@
-v0.1.3-dev
+v0.1.3

docs/conf.py

@@ -50,17 +50,17 @@
 
 # General information about the project.
 project = u'poseidon'
-copyright = u'2017, dgrossman'
-author = u'dgrossman'
+copyright = u'2016-2018, In-Q-Tel, Inc'
+author = u'Cyber Reboot'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1.3-dev'
+version = u'0.1.3'
 # The full version, including alpha/beta/rc tags.
-release = u'0.1.3-dev'
+release = u'0.1.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

poseidon/poseidonMonitor/NorthBoundControllerAbstraction/proxy/faucet/parser.py

@@ -40,12 +40,15 @@ def __init__(self, mirror_ports=None):
 
     def config(self, config_file, action, port, switch):
         switch_found = None
-        if config_file:
-            # TODO check for other files
+        # TODO check for other files
+        if not config_file:
+            # default to FAUCET default
+            config_file = '/etc/ryu/faucet/faucet.yaml'
+        try:
             stream = open(config_file, 'r')
             obj_doc = yaml.safe_load(stream)
             stream.close()
-        else:
+        except Exception as e:
             return False
 
         if action == 'mirror':
@@ -123,8 +126,11 @@ def events(self, event):
 
     def log(self, log_file):
         mac_table = {}
+        if not log_file:
+            # default to FAUCET default
+            log_file = '/var/log/ryu/faucet/faucet.log'
         # NOTE very fragile, prone to errors
-        if log_file:
+        try:
             with open(log_file, 'r') as f:
                 for line in f:
                     if 'L2 learned' in line:
@@ -145,5 +151,7 @@ def log(self, log_file):
                             mac_table[learned_mac[10]].insert(0, data)
                         else:
                             mac_table[learned_mac[10]] = [data]
+        except Exception as e:
+            print("%s" % str(e))
         return mac_table