v0.9.8

Author: peppelinux

CHANGELOG

@@ -0,0 +1,10 @@
+0.9.8
+-----
+
+- added url parameter to override default url in drones
+
+0.9.7
+-----
+
+- GARR BBB drone
+- GARR Pexip drone

README.md

@@ -26,6 +26,8 @@ Available drones:
 You should know, that:
 - WebRTC needs a huge load, on a intel i7 processor you would start from 5 to 8 drones
 - hundreds of drones should be handled in a distribuited environment, a cluster of videodrones
+- Docker is the fastest way to built a fully working environment, ready to go
+- Drones have default hardcoded URLS in their code, please use `-url` parameter to override
 
 Setup
 -----
@@ -138,4 +140,7 @@ See [videodrone.drones.jitsi_chrome](src/videodrone/drones/jitsi_chrome.py) for
 Credits
 -------
 
-Fabio Farina (Garr Consortium), Massimo Carboni (Garr Consortium), Garrlab community.
+- Fabio Farina (Garr Consortium)
+- Massimo Carboni (Garr Consortium)
+- Garrlab community
+- IoRestoACasa Community

setup.py

@@ -7,7 +7,7 @@ def readme():
 DESC = "WebRTC python unit tests inspired to '80s"
 
 setup(name='videodrone',
-      version='0.9.7-2',
+      version='0.9.8',
       description=DESC,
       long_description=readme(),
       long_description_content_type='text/markdown',
@@ -16,7 +16,7 @@ def readme():
                    "Programming Language :: Python :: 3.6",
                    "Programming Language :: Python :: 3.7",
                    "Programming Language :: Python :: 3.8"],
-      url='https://github.com/peppelinux/airdrone',
+      url='https://github.com/peppelinux/videodrone',
       author='Giuseppe De Marco',
       author_email='giuseppe.demarco@unical.it',
       license="Apache 2.0",

src/videodrone/drones/bbbmeet_garr_chrome.py

@@ -19,11 +19,15 @@ def run(room='videodrone', y4m='./y4m', lifetime=360,
 
     num = kwargs.get('id', random.randrange(1000))
     suffix = kwargs.get('suffix', 'default')
+    url = kwargs.get('url', URL)
+    drone_name = f'videodrone-{suffix}-{num}'
     browser = get_chrome_browser(y4m=y4m, headless=headless)
-    browser.get(f'{URL}/{room}')
+    browser.get(f'{url}/{room}')
+    
     browser.find_element_by_xpath('//*[@id="room_access_code"]').send_keys(pin)
     browser.find_element_by_xpath('/html/body/div[2]/div/div/div[2]/div[2]/form/div/input[2]').click()
-    browser.find_element_by_xpath('//*[@id="_b_giu-1qd-xfs-muy_join_name"]').send_keys(f'videodrone-{suffix}-{num}')
+    browser.find_element_by_class_name('join-form').send_keys(drone_name)
+    
     browser.find_element_by_id('room-join').click()
 
     # connection to audio server, this could be lagged
@@ -36,12 +40,12 @@ def run(room='videodrone', y4m='./y4m', lifetime=360,
 
     # show cam
     time.sleep(5)
-    ui_element = "icon-bbb-video_off"
-    status_exp = None
     # element_1 = WebDriverWait(browser, 60).until(EC.presence_of_element_located((By.CLASS_NAME, ui_element)))
-    element_1 = browser.find_element_by_class_name(ui_element)
+    element_1 = browser.find_element_by_class_name("icon-bbb-video_off")
     element_2 = browser.find_element_by_xpath('//*[@id="tippy-25"]/span[1]')
     element_3 = browser.find_element_by_id('tippy-25')
+    
+    status_exp = None
     for i in (element_1, element_2, element_3):
         try:
             i.click()

src/videodrone/drones/edumeet_garr_chrome.py

@@ -10,8 +10,10 @@
 
 
 def run(room, y4m, lifetime=360, headless=1, **kwargs):
+    url = kwargs.get('url', URL)
     browser = get_chrome_browser(y4m=y4m, headless=headless)
-    browser.get(f'{URL}/{room}')
+    browser.get(f'{url}/{room}')
+    
     browser.find_element_by_xpath('/html/body/div[2]/div[3]/div/div[3]/button[2]').click()
     # browser.find_element(By.XPATH('/html/body/div[2]/div[3]/div/div[3]/button[2]')).click()
     time.sleep(lifetime)

src/videodrone/drones/jitsi_chrome.py

@@ -11,8 +11,10 @@
 
 
 def run(room, y4m, lifetime=360, headless=1, **kwargs):
+    url = kwargs.get('url', URL)
     browser = get_chrome_browser(y4m=y4m, headless=headless)
-    browser.get(f'{URL}/{room}')
+    browser.get(f'{url}/{room}')
+    
     # Deprecation Warning
     browser.find_element_by_class_name('action-btn').click()
     # browser.find_element(value='action-btn', by=By.CLASS_NAME)

src/videodrone/drones/lepida_iorestoacasawork_chrome.py

@@ -10,8 +10,10 @@
 
 
 def run(room, y4m, lifetime=360, headless=1, **kwargs):
+    url = kwargs.get('url', URL)
     browser = get_chrome_browser(y4m=y4m, headless=headless)
-    browser.get(f'{URL}/{room}')
+    browser.get(f'{url}/{room}')
+    
     browser.find_element_by_xpath('/html/body/div[2]/div[3]/div/div[3]/button[2]').click()
     # browser.find_element(By.XPATH('/html/body/div[2]/div[3]/div/div[3]/button[2]')).click()
     time.sleep(lifetime)

src/videodrone/drones/openmeet_garr_chrome.py

@@ -9,8 +9,10 @@
 
 
 def run(room, y4m, lifetime=360, headless=1, **kwargs):
+    url = kwargs.get('url', URL)
     browser = get_chrome_browser(y4m=y4m, headless=headless)
-    browser.get(f'{URL}/{room}')
+    browser.get(f'{url}/{room}')
+    
     time.sleep(lifetime)
     # leave the room
     try:

src/videodrone/drones/pexip_garr_chrome.py

@@ -13,11 +13,12 @@
 
 def run(room='videodrone', y4m='./y4m', lifetime=360, 
         headless=1, pin=None, **kwargs):
-    
     num = kwargs.get('id', random.randrange(1000))
     suffix = kwargs.get('suffix', 'default')
+    
+    url = kwargs.get('url', URL)
     browser = get_chrome_browser(y4m=y4m, headless=headless)
-    browser.get(f'{URL}/{room}')
+    browser.get(f'{url}/{room}')
 
     time.sleep(3)
     browser.find_element_by_id('display-name-dialog-input').send_keys(f'videodrone-{suffix}-{num}')

videodrone

@@ -24,6 +24,8 @@ parser.add_argument('-c', required=False,
                     default='videodrone.drones.jitsi_chrome')
 parser.add_argument('-y4m', required=False,
                     help=("y4m path, where media files resides."))
+parser.add_argument('-url', required=False,
+                    help=("URL - overrides the constant url in the drones"))
 parser.add_argument('-room', required=True,
                     help=("room name"))
 parser.add_argument('-pin', required=False,
@@ -49,6 +51,7 @@ timeout = args.t
 room = args.room
 pin=args.pin
 y4m = args.y4m
+url = args.url
 lifetime = args.lifetime
 headless=args.headless
 suffix=args.suffix
@@ -61,7 +64,7 @@ drone_conn = importlib.import_module(drone_path)
 if wn <= 1:
     # single mode: Default
     drone_conn.run(room=room, y4m=y4m, lifetime=lifetime, pin=pin,
-                   headless=headless, id=0, suffix=suffix)
+                   headless=headless, id=0, suffix=suffix, url=url)
 else:
     # Parallel
     for i in range(wn):
@@ -72,7 +75,8 @@ else:
                                'lifetime': lifetime,
                                'headless':headless,
                                'id': i,
-                               'suffix': suffix})
+                               'suffix': suffix,
+                               'url' : url})
         time.sleep(timeout)
         p.start()
         logger.info(f'Started drone {p}')