Merge branch 'release/0.4.1'

Author: btorresgil

HISTORY.rst

@@ -3,6 +3,17 @@
 History
 =======
 
+0.4.1
+-----
+
+Released: 2017-05-12
+
+Status: Alpha
+
+- Add: Support new HA error added in PAN-OS 7.1
+- Fix: Issue where existing references are sometimes removed when adding a new reference
+- Fix: AttributeError on None when refreshing device-groups and none exist yet
+
 0.4.0
 -----
 

pandevice/__init__.py

@@ -23,7 +23,7 @@
 
 __author__ = 'Palo Alto Networks'
 __email__ = '[email protected]'
-__version__ = '0.4.0'
+__version__ = '0.4.1'
 
 
 import logging

pandevice/base.py

@@ -1121,6 +1121,9 @@ def refreshall_from_xml(self, xml, refresh_children=True, variables=None):
         """
         instances = []
 
+        if xml is None:
+            return []
+
         # Get the objects from the xml at this level
         if self.SUFFIX is None:
             objects = [xml]
@@ -1266,12 +1269,12 @@ def _set_reference(self, reference_name, reference_type, reference_var, exclusiv
                 references = getattr(obj, reference_var)
                 if references is None:
                     continue
-                elif hasattr(self, "__iter__") and self in references:
+                elif hasattr(references, "__iter__") and self in references:
                     if reference_name is not None and str(getattr(obj, reference_type.NAME)) == reference_name:
                         continue
                     references.remove(self)
                     if update: obj.update(reference_var)
-                elif hasattr(self, "__iter__") and str(self) in references:
+                elif hasattr(references, "__iter__") and str(self) in references:
                     if reference_name is not None and str(getattr(obj, reference_type.NAME)) == reference_name:
                         continue
                     references.remove(str(self))
@@ -1290,7 +1293,6 @@ def _set_reference(self, reference_name, reference_type, reference_var, exclusiv
                 if update: obj.update(reference_var)
             elif hasattr(var, "__iter__") and self not in var and str(self) not in var:
                 var.append(self)
-                setattr(obj, reference_var, var)
                 if update: obj.update(reference_var)
             elif hasattr(var, "__iter__"):
                 # The reference already exists so do nothing
@@ -3537,8 +3539,14 @@ def synchronize_config(self):
             line = response.find("./msg/line")
             if line is None:
                 raise err.PanDeviceError("Unable to syncronize configuration, no response from firewall")
-            if line.text.startswith("successfully sync'd running configuration to HA peer"):
+            elif line.text.startswith("successfully sync'd running configuration to HA peer"):
+                # PAN-OS 7.0
                 return True
+            elif line.text.startswith("HA synchronization job has been queued on peer. "
+                                      "Please check job status on peer."):
+                # PAN-OS 7.1
+                # Wait until synchronization done
+                return self.watch_op("show high-availability state", "group/running-sync", "synchronized")
             else:
                 raise err.PanDeviceError("Unable to syncronize configuration: %s" % line.text)
         else:

pandevice/panorama.py

@@ -311,11 +311,12 @@ def refresh_devices(self, devices=(), only_connected=False, expand_vsys=True, in
 
         # Combine the config XML and operational command XML to get a complete picture
         # of the device groups
-        for dg_entry in devicegroup_configxml:
-            for fw_entry in dg_entry.find('devices'):
-                fw_entry_op = devicegroup_opxml.find("entry/devices/entry[@name='%s']" % fw_entry.get("name"))
-                if fw_entry_op is not None:
-                    pandevice.xml_combine(fw_entry, fw_entry_op)
+        if devicegroup_configxml is not None:
+            for dg_entry in devicegroup_configxml:
+                for fw_entry in dg_entry.find('devices'):
+                    fw_entry_op = devicegroup_opxml.find("entry/devices/entry[@name='%s']" % fw_entry.get("name"))
+                    if fw_entry_op is not None:
+                        pandevice.xml_combine(fw_entry, fw_entry_op)
 
         dg = DeviceGroup()
         dg.parent = self

setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name='pandevice',
-    version='0.4.0',
+    version='0.4.1',
     description='Framework for interacting with Palo Alto Networks devices via API',
     long_description='The Palo Alto Networks Device Framework is a way to interact with Palo Alto Networks devices (including Next-generation Firewalls and Panorama) using the device API that is object oriented and conceptually similar to interaction with the device via the GUI or CLI.',
     author='Palo Alto Networks',