changes default create_session to relayed, fixes #33

Author: aoberoi

opentok/opentok.py

@@ -149,7 +149,7 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, dat
         )
         return token
 
-    def create_session(self, location=None, media_mode=MediaModes.routed):
+    def create_session(self, location=None, media_mode=MediaModes.relayed):
         """
         Creates a new OpenTok session and returns the session ID, which uniquely identifies
         the session.
@@ -172,10 +172,10 @@ def create_session(self, location=None, media_mode=MediaModes.routed):
         :param String mediaMode: Determines whether the session will transmit streams using the
              OpenTok Media Router (MediaMode.ROUTED) or not (MediaMode.RELAYED). By default,
              sessions use the OpenTok Media Router.
-             
+
              The OpenTok Media Router (see http://www.tokbox.com/#multiparty)
              provides the following benefits:
-            
+
                * The OpenTok Media Router can decrease bandwidth usage in multiparty sessions.
                    (When the mediaMode property is set to  MediaMode.RELAYED, each client must send
                    a separate audio-video stream to each client subscribing to it.)
@@ -189,12 +189,12 @@ def create_session(self, location=None, media_mode=MediaModes.routed):
 
                * The OpenTok Media Router supports the archiving feature, which lets
                  you record, save, and retrieve OpenTok sessions (see http://tokbox.com/platform/archiving).
-            
+
              With the mediaMode property set to MediaMode.RELAYED, the session
-             will attempt to transmit streams directly between clients. If clients cannot connect 
+             will attempt to transmit streams directly between clients. If clients cannot connect
              due to firewall restrictions, the session uses the OpenTok TURN server to relay
              audio-video streams.
-             
+
              You will be billed for streamed minutes if you use the OpenTok Media Router or if the
              session uses the OpenTok TURN server to relay streams. For information on pricing, see
              the OpenTok pricing page (http://www.tokbox.com/pricing).

tests/test_session_creation.py

@@ -24,27 +24,27 @@ def test_create_default_session(self):
 
         expect(httpretty.last_request().headers[u('x-tb-partner-auth')]).to.equal(self.api_key+u(':')+self.api_secret)
         expect(httpretty.last_request().headers[u('user-agent')]).to.contain(u('OpenTok-Python-SDK/')+__version__)
-        expect(httpretty.last_request().body).to.equal(b('p2p.preference=disabled'))
+        expect(httpretty.last_request().body).to.equal(b('p2p.preference=enabled'))
         expect(session).to.be.a(Session)
         expect(session).to.have.property(u('session_id')).being.equal(u('1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg'))
-        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.routed)
+        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.relayed)
         expect(session).to.have.property(u('location')).being.equal(None)
 
     @httpretty.activate
-    def test_create_p2p_session(self):
+    def test_create_routed_session(self):
         httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/session/create'),
                                body=u('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><sessions><Session><session_id>1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg</session_id><partner_id>123456</partner_id><create_dt>Mon Mar 17 00:41:31 PDT 2014</create_dt></Session></sessions>'),
                                status=200,
                                content_type=u('text/xml'))
 
-        session = self.opentok.create_session(media_mode=MediaModes.relayed)
+        session = self.opentok.create_session(media_mode=MediaModes.routed)
 
         expect(httpretty.last_request().headers[u('x-tb-partner-auth')]).to.equal(self.api_key+u(':')+self.api_secret)
         expect(httpretty.last_request().headers[u('user-agent')]).to.contain(u('OpenTok-Python-SDK/')+__version__)
-        expect(httpretty.last_request().body).to.equal(b('p2p.preference=enabled'))
+        expect(httpretty.last_request().body).to.equal(b('p2p.preference=disabled'))
         expect(session).to.be.a(Session)
         expect(session).to.have.property(u('session_id')).being.equal(u('1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg'))
-        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.relayed)
+        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.routed)
         expect(session).to.have.property(u('location')).being.equal(None)
 
     @httpretty.activate
@@ -61,30 +61,30 @@ def test_create_session_with_location_hint(self):
         # ordering of keys is non-deterministic, must parse the body to see if it is correct
         body = parse_qs(httpretty.last_request().body)
         expect(body).to.have.key(b('location')).being.equal([b('12.34.56.78')])
-        expect(body).to.have.key(b('p2p.preference')).being.equal([b('disabled')])
+        expect(body).to.have.key(b('p2p.preference')).being.equal([b('enabled')])
         expect(session).to.be.a(Session)
         expect(session).to.have.property(u('session_id')).being.equal(u('1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg'))
-        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.routed)
+        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.relayed)
         expect(session).to.have.property(u('location')).being.equal(u('12.34.56.78'))
 
     @httpretty.activate
-    def test_create_p2p_session_with_location_hint(self):
+    def test_create_routed_session_with_location_hint(self):
         httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/session/create'),
                                body=u('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><sessions><Session><session_id>1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg</session_id><partner_id>123456</partner_id><create_dt>Mon Mar 17 00:41:31 PDT 2014</create_dt></Session></sessions>'),
                                status=200,
                                content_type=u('text/xml'))
 
-        session = self.opentok.create_session(location='12.34.56.78', media_mode=MediaModes.relayed)
+        session = self.opentok.create_session(location='12.34.56.78', media_mode=MediaModes.routed)
 
         expect(httpretty.last_request().headers[u('x-tb-partner-auth')]).to.equal(self.api_key+u(':')+self.api_secret)
         expect(httpretty.last_request().headers[u('user-agent')]).to.contain(u('OpenTok-Python-SDK/')+__version__)
         # ordering of keys is non-deterministic, must parse the body to see if it is correct
         body = parse_qs(httpretty.last_request().body)
         expect(body).to.have.key(b('location')).being.equal([b('12.34.56.78')])
-        expect(body).to.have.key(b('p2p.preference')).being.equal([b('enabled')])
+        expect(body).to.have.key(b('p2p.preference')).being.equal([b('disabled')])
         expect(session).to.be.a(Session)
         expect(session).to.have.property(u('session_id')).being.equal(u('1_MX4xMjM0NTZ-fk1vbiBNYXIgMTcgMDA6NDE6MzEgUERUIDIwMTR-MC42ODM3ODk1MzQ0OTQyODA4fg'))
-        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.relayed)
+        expect(session).to.have.property(u('media_mode')).being.equal(MediaModes.routed)
         expect(session).to.have.property(u('location')).being.equal(u('12.34.56.78'))
 
     # TODO: all the cases that throw exceptions