Skip to content

Commit eed0053

Browse files
jgarmanjgarman
committed
psc changes
1 parent 2e53ebb commit eed0053

22 files changed

+381
-40
lines changed

‎docs/index.rst

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,86 @@ If you're more a Cb Protection fellow, then you're in luck as well::
6464

6565
As of version 1.2, cbapi now provides support for Cb Defense too!
6666

67+
>>> from cbapi.psc.defense import Device
68+
>>> from cbapi.defense import CbDefenseAPI
69+
>>> #
70+
>>> # Create our Cb Defense API object
71+
>>> #
72+
>>> p = CbDefenseAPI()
73+
>>> #
74+
>>> # Select any devices that have the hostname WIN-IA9NQ1GN8OI and an internal IP address of 192.168.215.150
75+
>>> #
76+
>>> devices = c.select(Device).where('hostNameExact:WIN-IA9NQ1GN8OI').and_("ipAddress:192.168.215.150").first()
77+
>>> #
78+
>>> # Change those devices' policy into the Windows_Restrictive_Workstation policy.
79+
>>> #
80+
>>> for dev in devices:
81+
>>> dev.policyName = "Restrictive_Windows_Workstation"
82+
>>> dev.save()
83+
84+
85+
86+
87+
>>> from cbapi.psc.defense import Device
88+
>>> from cbapi.defense import CbDefenseAPI
89+
>>> #
90+
>>> # Create our Cb Defense API object
91+
>>> #
92+
>>> p = CbDefenseAPI()
93+
>>> #
94+
>>> # Select any devices that have the hostname WIN-IA9NQ1GN8OI and an internal IP address of 192.168.215.150
95+
>>> #
96+
>>> devices = c.select(Device).where('hostNameExact:WIN-IA9NQ1GN8OI').and_("ipAddress:192.168.215.150").first()
97+
>>> #
98+
>>> # Change those devices' policy into the Windows_Restrictive_Workstation policy.
99+
>>> #
100+
>>> for dev in devices:
101+
>>> dev.policyName = "Restrictive_Windows_Workstation"
102+
>>> dev.save()
103+
104+
105+
106+
107+
>>> from cbapi.defense.models import Device
108+
>>> from cbapi.psc.defense import CbDefenseAPI
109+
>>> #
110+
>>> # Create our Cb Defense API object
111+
>>> #
112+
>>> p = CbDefenseAPI()
113+
>>> #
114+
>>> # Select any devices that have the hostname WIN-IA9NQ1GN8OI and an internal IP address of 192.168.215.150
115+
>>> #
116+
>>> devices = c.select(Device).where('hostNameExact:WIN-IA9NQ1GN8OI').and_("ipAddress:192.168.215.150").first()
117+
>>> #
118+
>>> # Change those devices' policy into the Windows_Restrictive_Workstation policy.
119+
>>> #
120+
>>> for dev in devices:
121+
>>> dev.policyName = "Restrictive_Windows_Workstation"
122+
>>> dev.save()
123+
124+
125+
126+
127+
>>> from cbapi.defense.models import Device
128+
>>> from cbapi.psc.defense import CbDefenseAPI
129+
>>> #
130+
>>> # Create our Cb Defense API object
131+
>>> #
132+
>>> p = CbDefenseAPI()
133+
>>> #
134+
>>> # Select any devices that have the hostname WIN-IA9NQ1GN8OI and an internal IP address of 192.168.215.150
135+
>>> #
136+
>>> devices = c.select(Device).where('hostNameExact:WIN-IA9NQ1GN8OI').and_("ipAddress:192.168.215.150").first()
137+
>>> #
138+
>>> # Change those devices' policy into the Windows_Restrictive_Workstation policy.
139+
>>> #
140+
>>> for dev in devices:
141+
>>> dev.policyName = "Restrictive_Windows_Workstation"
142+
>>> dev.save()
143+
144+
145+
146+
67147
>>> from cbapi.defense.models import Device
68148
>>> from cbapi.defense import CbDefenseAPI
69149
>>> #

‎examples/defense/cblr_cli.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#!/usr/bin/env python
22

3-
from cbapi.example_helpers import build_cli_parser, get_cb_defense_object, CblrCli
4-
from cbapi.defense import Device
5-
import logging
63
import sys
74

5+
import logging
6+
7+
from cbapi.example_helpers import build_cli_parser, get_cb_defense_object, CblrCli
8+
from cbapi.psc.defense import Device
9+
810
log = logging.getLogger(__name__)
911

1012

‎examples/defense/list_devices.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env python
22

33
import sys
4-
from cbapi.defense.models import Device
4+
55
from cbapi.example_helpers import build_cli_parser, get_cb_defense_object
6+
from cbapi.psc.defense import Device
67

78

89
def main():

‎examples/defense/move_device.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env python
22

33
import sys
4-
from cbapi.defense.models import Device
4+
55
from cbapi.example_helpers import build_cli_parser, get_cb_defense_object
6+
from cbapi.psc.defense import Device
67

78

89
def main():

‎examples/defense/policy_operations.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
#
33

44
import sys
5-
from cbapi.defense import Policy
6-
from cbapi.example_helpers import build_cli_parser, get_cb_defense_object
7-
from cbapi.errors import ServerError
8-
import logging
5+
96
import json
7+
import logging
8+
9+
from cbapi.errors import ServerError
10+
from cbapi.example_helpers import build_cli_parser, get_cb_defense_object
11+
from cbapi.psc.defense import Policy
1012

1113
log = logging.getLogger(__name__)
1214

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from setuptools import setup
66
import sys
77

8-
packages = ['cbapi', 'cbapi.protection', 'cbapi.response', 'cbapi.cache', 'cbapi.defense']
8+
packages = ['cbapi', 'cbapi.protection', 'cbapi.response', 'cbapi.cache', 'cbapi.psc.defense']
99
if sys.version_info < (3, 0):
1010
packages.extend(['cbapi.legacy', 'cbapi.legacy.util'])
1111

‎src/cbapi/__init__.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from __future__ import absolute_import
2+
23
import cbapi.six
34

45
__title__ = 'cbapi'
@@ -10,7 +11,10 @@
1011
# New API as of cbapi 0.9.0
1112
from cbapi.response.rest_api import CbEnterpriseResponseAPI, CbResponseAPI
1213
from cbapi.protection.rest_api import CbEnterpriseProtectionAPI, CbProtectionAPI
13-
from cbapi.defense.rest_api import CbDefenseAPI
14+
from cbapi.psc.defense import CbDefenseAPI
15+
16+
# for compatibility with Cb Defense code from cbapi < 1.4.0
17+
import cbapi.psc.defense as defense
1418

1519
# LEGACY APIs, will deprecated as of cbapi 2.0.0
1620
# only import these if the Python version is 2.x

‎src/cbapi/defense.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Compatibility with old Defense API code
2+
from cbapi.psc.defense import *

‎src/cbapi/example_helpers.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
import argparse
2-
from cbapi.response import CbEnterpriseResponseAPI
3-
from cbapi.protection import CbEnterpriseProtectionAPI
4-
from cbapi.defense import CbDefenseAPI
5-
import codecs
61
import sys
7-
import shutil
2+
import time
3+
4+
import argparse
85
import cmd
6+
import codecs
7+
import logging
98
import ntpath
10-
import time
9+
import shutil
1110
import subprocess
1211
from optparse import OptionParser
13-
import logging
1412

13+
from cbapi.protection import CbEnterpriseProtectionAPI
14+
from cbapi.psc.defense import CbDefenseAPI
15+
from cbapi.response import CbEnterpriseResponseAPI
1516

1617
log = logging.getLogger(__name__)
1718

‎src/cbapi/live_response_api.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,7 @@ def poll_status(cb, url, desired_status="complete", timeout=None, delay=None):
911911
while status != desired_status and time.time() - start_time < timeout:
912912
res = cb.get_object(url)
913913
if res["status"] == desired_status:
914+
log.debug(json.dumps(res))
914915
return res
915916
elif res["status"] == "error":
916917
raise LiveResponseError(res)

0 commit comments

Comments
 (0)