Use tgt_type instead of expr_form (deprecated in 2017.07 - removed in…

… 2019.02)
saltstack · Apr 2, 2019 · f4390b7 · f4390b7
1 parent 7413e54
commit f4390b7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/pepper/cli.py b/pepper/cli.py
@@ -200,50 +200,50 @@ def add_tgtopts(self):
         '''
         optgroup = optparse.OptionGroup(self.parser, "Targeting Options", "Target which minions to run commands on")
 
-        optgroup.defaults.update({'expr_form': 'glob'})
+        optgroup.defaults.update({'tgt_type': 'glob'})
 
         optgroup.add_option(
-            '-E', '--pcre', dest='expr_form', action='store_const', const='pcre',
+            '-E', '--pcre', dest='tgt_type', action='store_const', const='pcre',
             help="Target hostnames using PCRE regular expressions",
         )
 
         optgroup.add_option(
-            '-L', '--list', dest='expr_form', action='store_const', const='list',
+            '-L', '--list', dest='tgt_type', action='store_const', const='list',
             help="Specify a comma delimited list of hostnames",
         )
 
         optgroup.add_option(
-            '-G', '--grain', dest='expr_form', action='store_const', const='grain',
+            '-G', '--grain', dest='tgt_type', action='store_const', const='grain',
             help="Target based on system properties",
         )
 
         optgroup.add_option(
-            '--grain-pcre', dest='expr_form', action='store_const', const='grain_pcre',
+            '--grain-pcre', dest='tgt_type', action='store_const', const='grain_pcre',
             help="Target based on PCRE matches on system properties",
         )
 
         optgroup.add_option(
-            '-I', '--pillar', dest='expr_form', action='store_const', const='pillar',
+            '-I', '--pillar', dest='tgt_type', action='store_const', const='pillar',
             help="Target based on pillar values",
         )
 
         optgroup.add_option(
-            '--pillar-pcre', dest='expr_form', action='store_const', const='pillar_pcre',
+            '--pillar-pcre', dest='tgt_type', action='store_const', const='pillar_pcre',
             help="Target based on PCRE matches on pillar values"
         )
 
         optgroup.add_option(
-            '-R', '--range', dest='expr_form', action='store_const', const='range',
+            '-R', '--range', dest='tgt_type', action='store_const', const='range',
             help="Target based on range expression",
         )
 
         optgroup.add_option(
-            '-C', '--compound', dest='expr_form', action='store_const', const='compound',
+            '-C', '--compound', dest='tgt_type', action='store_const', const='compound',
             help="Target based on compound expression",
         )
 
         optgroup.add_option(
-            '-N', '--nodegroup', dest='expr_form', action='store_const', const='nodegroup',
+            '-N', '--nodegroup', dest='tgt_type', action='store_const', const='nodegroup',
             help="Target based on a named nodegroup",
         )
 
@@ -498,7 +498,7 @@ def parse_cmd(self, api):
             if len(args) < 2:
                 self.parser.error("Command or target not specified")
 
-            low['tgt_type'] = self.options.expr_form
+            low['tgt_type'] = self.options.tgt_type
             low['tgt'] = args.pop(0)
             low['fun'] = args.pop(0)
             low['batch'] = self.options.batch
@@ -540,7 +540,7 @@ def parse_cmd(self, api):
             if len(args) < 2:
                 self.parser.error("Command or target not specified")
 
-            low['tgt_type'] = self.options.expr_form
+            low['tgt_type'] = self.options.tgt_type
             low['tgt'] = args.pop(0)
             low['fun'] = args.pop(0)
             low['batch'] = self.options.batch

diff --git a/pepper/libpepper.py b/pepper/libpepper.py
@@ -307,7 +307,7 @@ def low(self, lowstate, path='/'):
         '''
         return self.req(path, lowstate)
 
-    def local(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
+    def local(self, tgt, fun, arg=None, kwarg=None, tgt_type='glob',
               timeout=None, ret=None):
         '''
         Run a single command using the ``local`` client
@@ -326,8 +326,8 @@ def local(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
         if kwarg:
             low['kwarg'] = kwarg
 
-        if expr_form:
-            low['expr_form'] = expr_form
+        if tgt_type:
+            low['tgt_type'] = tgt_type
 
         if timeout:
             low['timeout'] = timeout
@@ -337,7 +337,7 @@ def local(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
 
         return self.low([low])
 
-    def local_async(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
+    def local_async(self, tgt, fun, arg=None, kwarg=None, tgt_type='glob',
                     timeout=None, ret=None):
         '''
         Run a single command using the ``local_async`` client
@@ -356,8 +356,8 @@ def local_async(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
         if kwarg:
             low['kwarg'] = kwarg
 
-        if expr_form:
-            low['expr_form'] = expr_form
+        if tgt_type:
+            low['tgt_type'] = tgt_type
 
         if timeout:
             low['timeout'] = timeout
@@ -367,7 +367,7 @@ def local_async(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
 
         return self.low([low])
 
-    def local_batch(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
+    def local_batch(self, tgt, fun, arg=None, kwarg=None, tgt_type='glob',
                     batch='50%', ret=None):
         '''
         Run a single command using the ``local_batch`` client
@@ -386,8 +386,8 @@ def local_batch(self, tgt, fun, arg=None, kwarg=None, expr_form='glob',
         if kwarg:
             low['kwarg'] = kwarg
 
-        if expr_form:
-            low['expr_form'] = expr_form
+        if tgt_type:
+            low['tgt_type'] = tgt_type
 
         if batch:
             low['batch'] = batch