Merge pull request #9 from dbarrosop/master

Unified unittests

Author: dbarrosop

.gitignore

@@ -53,3 +53,4 @@ coverage.xml
 docs/_build/
 
 .idea
+.DS_Store

napalm/junos.py

@@ -16,7 +16,8 @@
 
 from jnpr.junos import Device
 from jnpr.junos.utils.config import Config
-
+from jnpr.junos.exception import ConfigLoadError
+from exceptions import ReplaceConfigException, MergeConfigException
 
 class JunOSDriver(NetworkDriver):
 
@@ -25,6 +26,7 @@ def __init__(self, hostname, username, password):
         self.username = username
         self.password = password
         self.device = Device(hostname, user=username, password=password)
+        self.config_replace = False
 
     def open(self):
         self.device.open()
@@ -35,23 +37,28 @@ def close(self):
         self.device.cu.unlock()
         self.device.close()
 
-    def load_replace_candidate(self, filename=None, config=None):
+    def _load_candidate(self, filename, config, overwrite):
         if filename is None:
             configuration = config
         else:
             with open(filename) as f:
                 configuration = f.read()
 
-        self.device.cu.load(configuration, format='text', overwrite=True)
+        try:
+            self.device.cu.load(configuration, format='text', overwrite=overwrite)
+        except ConfigLoadError as e:
+            if self.config_replace:
+                raise ReplaceConfigException(e.message)
+            else:
+                raise MergeConfigException(e.message)
 
-    def load_merge_candidate(self, filename=None, config=None):
-        if filename is None:
-            configuration = config
-        else:
-            with open(filename) as f:
-                configuration = f.read()
+    def load_replace_candidate(self, filename=None, config=None):
+        self.config_replace = True
+        self._load_candidate(filename, config, True)
 
-        self.device.cu.load(configuration, format='text')
+    def load_merge_candidate(self, filename=None, config=None):
+        self.config_replace = False
+        self._load_candidate(filename, config, False)
 
     def compare_config(self):
         diff = self.device.cu.diff()

test/unit/config.py test/unit/TestJunOSDriver.py

@@ -1,4 +1,4 @@
-# Copyright 2014 Spotify AB. All rights reserved.
+# Copyright 2015 Spotify AB. All rights reserved.
 #
 # The contents of this file are licensed under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with the
@@ -12,9 +12,20 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-hostname = '10.48.71.3'
-username = 'admin'
-password = 'sp0tify'
-use_ssl = True
-config_file_1 = 'config01.txt'
-config_file_2 = 'config02.txt'
+import unittest
+
+from napalm.junos import JunOSDriver
+from base import TestNetworkDriver
+
+
+class TestJunOSDriver(unittest.TestCase, TestNetworkDriver):
+
+    @classmethod
+    def setUpClass(cls):
+        hostname = '192.168.76.11'
+        username = 'dbarroso'
+        password = 'this_is_not_a_secure_password'
+        cls.vendor = 'junos'
+
+        cls.device = JunOSDriver(hostname, username, password)
+        cls.device.open()