Support vsys for import_file().

bin/panxapi.py

@@ -251,9 +251,11 @@ def main():
             action = 'import'
             if options['ad_hoc'] is not None:
                 extra_qs_used = True
+            vsys = options['vsys'][0] if len(options['vsys']) else None
             xapi.import_file(category=options['import'],
                              file=options['file'],
                              filename=options['name'],
+                             vsys=vsys,
                              extra_qs=options['ad_hoc'])
             print_status(xapi, action)
             print_response(xapi, options)
@@ -903,7 +905,7 @@ def usage():
     --file path           import file path
     --strict yes|no       multi-config strict-transactional
     --vsys vsys           VSYS for dynamic update/partial commit/
-                          operational command/report
+                          operational command/report/import
     -l api_username[:api_password]
     -h hostname
     -P port               URL port number

doc/pan.xapi.rst

@@ -434,8 +434,8 @@ Threat PCAP export
  exporting from firewall devices, however this requirement will be
  removed in a future version of PAN-OS.
 
-import_file(category=None, file=None, filename=None)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+import_file(category=None, file=None, filename=None, vsys=None)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
  The import_file() method performs the ``type=import`` import file API
  request with the **category** argument.
@@ -460,6 +460,9 @@ import_file(category=None, file=None, filename=None)
  the ``Content-Disposition`` header.  If **filename** is not specified
  and **file** specifies a path, the basename of the path is used.
 
+ The **vsys** argument is used to set the location to a specific
+ Virtual System.
+
 log(self, log_type=None, nlogs=None, skip=None, filter=None, interval=None, timeout=None)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

doc/panxapi.rst

@@ -68,7 +68,7 @@ SYNOPSIS
     --file path           import file path
     --strict yes|no       multi-config strict-transactional
     --vsys vsys           VSYS for dynamic update/partial commit/
-                          operational command/report
+                          operational command/report/import
     -l api_username[:api_password]
     -h hostname
     -P port               URL port number
@@ -276,6 +276,9 @@ DESCRIPTION
 
   The **--name** option is used to specify the file name.
 
+  The **--vsys** option is used to set the location to a specific
+  Virtual System.
+
   The **--ad-hoc** option is used to specify additional import
   arguments, for example:
 
@@ -408,8 +411,8 @@ DESCRIPTION
 
  ``--vsys`` *vsys*
   Specify optional **vsys** for dynamic update (**-U**), partial vsys
-  commit (**--partial** vsys), commit-all (**-A**) and operational
-  commands (**-o**).
+  commit (**--partial** vsys), commit-all (**-A**), operational
+  commands (**-o**) and import (**--import**).
 
   *vsys* can be specified using name (**vsys2**) or number (**2**).
 

lib/pan/xapi.py

@@ -1043,6 +1043,7 @@ def import_file(self,
                     category=None,
                     file=None,
                     filename=None,
+                    vsys=None,
                     extra_qs=None):
         self.__set_api_key()
         self.__clear_response()
@@ -1052,6 +1053,8 @@ def import_file(self,
         query['key'] = self.api_key
         if category is not None:
             query['category'] = category
+        if vsys is not None:
+            query['vsys'] = vsys
         if extra_qs is not None:
             query = self.__merge_extra_qs(query, extra_qs)