From 45a3c89b0bc56d09570a39e5a8a8fe54158853c5 Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 15 Feb 2021 18:58:08 -0800
Subject: [PATCH] Add ou <OrgUnitPath> to print browsers (#1324)

---
 src/GamCommands.txt  | 2 +-
 src/gam/gapi/cbcm.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 0294f1af..11a10f64 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -1127,7 +1127,7 @@ gam info browser <DeviceID>
 	[fields <BrowserFieldNameList>]
 
 gam print browsers [todrive]
-	[query <QueryBrowser>]
+	[ou|org|orgunit <OrgUnitPath>] [query <QueryBrowser>]
 	[projection basic|full]
 	[fields <BrowserFieldNameList>]
 	[sortheaders]
diff --git a/src/gam/gapi/cbcm.py b/src/gam/gapi/cbcm.py
index 2be5dbf8..5cbf8c96 100644
--- a/src/gam/gapi/cbcm.py
+++ b/src/gam/gapi/cbcm.py
@@ -121,7 +121,7 @@ def move():
 def print_():
     cbcm = build()
     projection = 'BASIC'
-    query = None
+    orgUnitPath = query = None
     fields = None
     titles = []
     csv_rows = []
@@ -133,6 +133,9 @@ def print_():
         if myarg == 'query':
             query = sys.argv[i+1]
             i += 2
+        elif myarg in ['ou', 'org', 'orgunit']:
+            orgUnitPath = gapi_directory_orgunits.getOrgUnitItem(sys.argv[i + 1], pathOnly=True, absolutePath=True)
+            i += 2
         elif myarg == 'projection':
             projection = sys.argv[i + 1].upper()
             i += 2
@@ -155,7 +158,7 @@ def print_():
     browsers = gapi.get_all_pages(cbcm.chromebrowsers(), 'list',
                          'browsers', page_message=page_message,
                          customer=GC_Values[GC_CUSTOMER_ID],
-                         query=query, projection=projection,
+                         orgUnitPath=orgUnitPath, query=query, projection=projection,
                          fields=fields)
     for browser in browsers:
         browser = utils.flatten_json(browser)