add ability to use a camera under nat

.gitignore

@@ -52,3 +52,8 @@ docs/_build/
 
 # PyBuilder
 target/
+
+.idea
+.venv
+Pipfile
+Pipfile.lock

README.rst

@@ -1,27 +1,24 @@
-python-onvif
+python-onvif-zeep
 ============
 
 ONVIF Client Implementation in Python
 
 Dependencies
 ------------
-`suds <https://pypi.python.org/pypi/suds>`_ >= 0.4
+`zeep <http://docs.python-zeep.org>`_ >= 3.0.0
 
-`suds-passworddigest <https://pypi.python.org/pypi/suds_passworddigest>`_
-
-Install python-onvif
---------------------
+Install python-onvif-zeep
+-------------------------
 **From Source**
 
 You should clone this repository and run setup.py::
 
-    cd python-onvif && python setup.py install
+    cd python-onvif-zeep && python setup.py install
 
-**From PyPI**
+Alternatively, you can run::
 
-::
+    pip install --upgrade onvif_zeep
 
-    pip install onvif
 
 Getting Started
 ---------------

examples/continuous_move.py

@@ -1,63 +1,100 @@
-from time import sleep
-
+import asyncio, sys
 from onvif import ONVIFCamera
 
+IP="192.168.0.100"   # Camera IP address
+PORT=10080           # Port
+USER="admin"         # Username
+PASS="password"        # Password
+
+
 XMAX = 1
 XMIN = -1
 YMAX = 1
 YMIN = -1
+moverequest = None
+ptz = None
+active = False
 
-def perform_move(ptz, request, timeout):
+def do_move(ptz, request):
     # Start continuous move
+    global active
+    if active:
+        ptz.Stop({'ProfileToken': request.ProfileToken})
+    active = True
     ptz.ContinuousMove(request)
-    # Wait a certain time
-    sleep(timeout)
-    # Stop continuous move
-    ptz.Stop({'ProfileToken': request.ProfileToken})
-
-def move_up(ptz, request, timeout=1):
-    print 'move up...'
-    request.Velocity.PanTilt._x = 0
-    request.Velocity.PanTilt._y = YMAX
-    perform_move(ptz, request, timeout)
-
-def move_down(ptz, request, timeout=1):
-    print 'move down...'
-    request.Velocity.PanTilt._x = 0
-    request.Velocity.PanTilt._y = YMIN
-    perform_move(ptz, request, timeout)
-
-def move_right(ptz, request, timeout=1):
-    print 'move right...'
-    request.Velocity.PanTilt._x = XMAX
-    request.Velocity.PanTilt._y = 0
-    perform_move(ptz, request, timeout)
-
-def move_left(ptz, request, timeout=1):
-    print 'move left...'
-    request.Velocity.PanTilt._x = XMIN
-    request.Velocity.PanTilt._y = 0
-    perform_move(ptz, request, timeout)
-
-def continuous_move():
-    mycam = ONVIFCamera('192.168.0.112', 80, 'admin', '12345')
+
+def move_up(ptz, request):
+    print ('move up...')
+    request.Velocity.PanTilt.x = 0
+    request.Velocity.PanTilt.y = YMAX
+    do_move(ptz, request)
+
+def move_down(ptz, request):
+    print ('move down...')
+    request.Velocity.PanTilt.x = 0
+    request.Velocity.PanTilt.y = YMIN
+    do_move(ptz, request)
+
+def move_right(ptz, request):
+    print ('move right...')
+    request.Velocity.PanTilt.x = XMAX
+    request.Velocity.PanTilt.y = 0
+    do_move(ptz, request)
+
+def move_left(ptz, request):
+    print ('move left...')
+    request.Velocity.PanTilt.x = XMIN
+    request.Velocity.PanTilt.y = 0
+    do_move(ptz, request)
+
+
+def move_upleft(ptz, request):
+    print ('move up left...')
+    request.Velocity.PanTilt.x = XMIN
+    request.Velocity.PanTilt.y = YMAX
+    do_move(ptz, request)
+
+def move_upright(ptz, request):
+    print ('move up left...')
+    request.Velocity.PanTilt.x = XMAX
+    request.Velocity.PanTilt.y = YMAX
+    do_move(ptz, request)
+
+def move_downleft(ptz, request):
+    print ('move down left...')
+    request.Velocity.PanTilt.x = XMIN
+    request.Velocity.PanTilt.y = YMIN
+    do_move(ptz, request)
+
+def move_downright(ptz, request):
+    print ('move down left...')
+    request.Velocity.PanTilt.x = XMAX
+    request.Velocity.PanTilt.y = YMIN
+    do_move(ptz, request)
+
+def setup_move():
+    mycam = ONVIFCamera(IP, PORT, USER, PASS)
     # Create media service object
     media = mycam.create_media_service()
+
     # Create ptz service object
+    global ptz
     ptz = mycam.create_ptz_service()
 
     # Get target profile
-    media_profile = media.GetProfiles()[0];
+    media_profile = media.GetProfiles()[0]
 
     # Get PTZ configuration options for getting continuous move range
     request = ptz.create_type('GetConfigurationOptions')
-    request.ConfigurationToken = media_profile.PTZConfiguration._token
+    request.ConfigurationToken = media_profile.PTZConfiguration.token
     ptz_configuration_options = ptz.GetConfigurationOptions(request)
 
-    request = ptz.create_type('ContinuousMove')
-    request.ProfileToken = media_profile._token
+    global moverequest
+    moverequest = ptz.create_type('ContinuousMove')
+    moverequest.ProfileToken = media_profile.token
+    if moverequest.Velocity is None:
+        moverequest.Velocity = ptz.GetStatus({'ProfileToken': media_profile.token}).Position
 
-    ptz.Stop({'ProfileToken': media_profile._token})
 
     # Get range of pan and tilt
     # NOTE: X and Y are velocity vector
@@ -67,17 +104,53 @@ def continuous_move():
     YMAX = ptz_configuration_options.Spaces.ContinuousPanTiltVelocitySpace[0].YRange.Max
     YMIN = ptz_configuration_options.Spaces.ContinuousPanTiltVelocitySpace[0].YRange.Min
 
-    # move right
-    move_right(ptz, request)
-
-    # move left
-    move_left(ptz, request)
-
-    # Move up
-    move_up(ptz, request)
-
-    # move down
-    move_down(ptz, request)
 
+def readin():
+    """Reading from stdin and displaying menu"""
+    global moverequest, ptz
+
+    selection = sys.stdin.readline().strip("\n")
+    lov=[ x for x in selection.split(" ") if x != ""]
+    if lov:
+
+        if lov[0].lower() in ["u","up"]:
+            move_up(ptz,moverequest)
+        elif lov[0].lower() in ["d","do","dow","down"]:
+            move_down(ptz,moverequest)
+        elif lov[0].lower() in ["l","le","lef","left"]:
+            move_left(ptz,moverequest)
+        elif lov[0].lower() in ["l","le","lef","left"]:
+            move_left(ptz,moverequest)
+        elif lov[0].lower() in ["r","ri","rig","righ","right"]:
+            move_right(ptz,moverequest)
+        elif lov[0].lower() in ["ul"]:
+            move_upleft(ptz,moverequest)
+        elif lov[0].lower() in ["ur"]:
+            move_upright(ptz,moverequest)
+        elif lov[0].lower() in ["dl"]:
+            move_downleft(ptz,moverequest)
+        elif lov[0].lower() in ["dr"]:
+            move_downright(ptz,moverequest)
+        elif lov[0].lower() in ["s","st","sto","stop"]:
+            ptz.Stop({'ProfileToken': moverequest.ProfileToken})
+            active = False
+        else:
+            print("What are you asking?\tI only know, 'up','down','left','right', 'ul' (up left), \n\t\t\t'ur' (up right), 'dl' (down left), 'dr' (down right) and 'stop'")
+
+    print("")
+    print("Your command: ", end='',flush=True)
+
+
 if __name__ == '__main__':
-    continuous_move()
+    setup_move()
+    loop = asyncio.get_event_loop()
+    try:
+        loop.add_reader(sys.stdin,readin)
+        print("Use Ctrl-C to quit")
+        print("Your command: ", end='',flush=True)
+        loop.run_forever()
+    except:
+        pass
+    finally:
+        loop.remove_reader(sys.stdin)
+        loop.close()

onvif/__init__.py

@@ -1,10 +1,10 @@
 from onvif.client import ONVIFService, ONVIFCamera, SERVICES
 from onvif.exceptions import ONVIFError, ERR_ONVIF_UNKNOWN, \
         ERR_ONVIF_PROTOCOL, ERR_ONVIF_WSDL, ERR_ONVIF_BUILD
-from onvif import cli
+#from onvif import cli
 
 __all__ = ( 'ONVIFService', 'ONVIFCamera', 'ONVIFError',
             'ERR_ONVIF_UNKNOWN', 'ERR_ONVIF_PROTOCOL',
             'ERR_ONVIF_WSDL', 'ERR_ONVIF_BUILD',
-            'SERVICES', 'cli'
+            'SERVICES'#, 'cli'
            )

onvif/cli.py

@@ -1,16 +1,15 @@
 #!/usr/bin/python
 '''ONVIF Client Command Line Interface'''
-
+from __future__ import print_function, division
 import re
 from cmd import Cmd
 from ast import literal_eval
-from json import dumps
-from argparse import ArgumentParser, ArgumentError, REMAINDER
+from argparse import ArgumentParser, REMAINDER
 
-from suds import MethodNotFound
-from suds.sax.text import Text
+from zeep.exceptions import LookupError as MethodNotFound
+from zeep.xsd import String as Text
 from onvif import ONVIFCamera, ONVIFService, ONVIFError
-from definition import SERVICES
+from onvif.definition import SERVICES
 import os.path
 
 SUPPORTED_SERVICES = SERVICES.keys()
@@ -21,10 +20,10 @@ def error(self, message):
         raise ValueError("%s\n%s" % (message, usage))
 
 def success(message):
-    print 'True: ' + str(message)
+    print('True: ' + str(message))
 
 def error(message):
-    print 'False: ' + str(message)
+    print('False: ' + str(message))
 
 class ONVIFCLI(Cmd):
     prompt = 'ONVIF >>> '
@@ -151,7 +150,7 @@ def main():
     try:
         args = parser.parse_args()
     except ValueError as err:
-        print str(err)
+        print(str(err))
         return
     # Also need parse configuration file.