autoverse-cli 0.15.6__py3-none-any.whl → 0.15.7__py3-none-any.whl

{autoverse_cli-0.15.6.dist-info → autoverse_cli-0.15.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: autoverse-cli
-Version: 0.15.6
+Version: 0.15.7
 Summary: The Autoverse CLI
 Author-email: Dan Kamrath <dan.kamrath@autonomalabs.com>
 License: # End-User License Agreement (EULA) of the Autonoma AutoVerse CLI

{autoverse_cli-0.15.6.dist-info → autoverse_cli-0.15.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 avrs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avrs/app_version.py,sha256=v9Br085iieKNuq_J6EGpa-bvsQvMt3AKhZyvMLN7GQ8,856
+avrs/app_version.py,sha256=OkKjPWlmlP2YbrQFrBiiISJSD6XC0MvhEekaXX6ak7Y,856
 avrs/argparse_help.py,sha256=EoEaohGXZXqJvs1dFEzbo9vh47CYdHdSY2Im2Ps2iFo,945
 avrs/avrs.py,sha256=bGF35a72MZU41OVWnFHmchqmgKXBKh9djokzGA_4pL4,4621
 avrs/can_tool.py,sha256=IBoctKobBJ3wCq4ZdtuXuXH4AMEUxazCfYT6YP0Luw8,7161
@@ -7,10 +7,10 @@ avrs/can_tool_util.py,sha256=G3q21dTGMLc09SDq_RieoW7kSn-kXPkXxPDjavPh4hQ,7710
 avrs/cfg.py,sha256=kMn08Z4Ms1PAu2-U1QI8weEJeIVEppP4A4_tFfwnjtg,2924
 avrs/launcher.py,sha256=kk1lyHHLgFZ4zsFfa_zV5f1kYbUODT6wEILJ8TZ16rQ,9353
 avrs/launcher_util.py,sha256=sO3k_z3A-HIQdJVkVXNXUAE_MGFwAYiZUqQBoFwOqew,5325
-avrs/race_cloud.py,sha256=8VHOrmCgdXKBBmAiX2e-muJ3dMxijwyJ7acR-LxytFo,19011
+avrs/race_cloud.py,sha256=pImJusZ4XCyl7tyt5Q5s69DjPxPvXfzWgkcRnzuWoeE,19119
 avrs/race_cloud_cfg_util.py,sha256=H3MLxkb-PBwFVXdA5IBGzWGjLeD-uBvPqIgkh7RGjfo,7214
 avrs/race_cloud_fwd_api.py,sha256=HuLE5kfmzVq08aP3tlEh3f8WNjGL5N3K5EbXg9uQomo,1506
-avrs/race_cloud_util.py,sha256=7pi6x2lgCqEgwmo3HXbdBZiCj43rTw5U9a1UDcClLm8,10753
+avrs/race_cloud_util.py,sha256=gpSHob0YA_ahFqqSFIKdi_3Jt36e1PF6oEEL-ni7el0,12343
 avrs/simconfig.py,sha256=UZc4FrxVHUkk2e9IglSpuojXkaL_nPrJW7trbEGgOOo,2907
 avrs/simconfig_util.py,sha256=1RmnmhK5C4HlCicTQeqn-1ORz3Xrku_QMt1Fqr9XjZs,4839
 avrs/tests.py,sha256=3JeYBjn0tRqHXERDROfzmYuW1KXeCcKur5Bw-EIegto,153
@@ -37,9 +37,9 @@ avrs/requests/toggle_hud.py,sha256=sV5t5QZc4uvRihPVk8jEKZiQNsyF9tsUwq5b4jjZplc,3
 avrs/requests/vd.py,sha256=gdt5XCdCCVdECL3qt8y-PKDrlArjeY_lxtT4VpZmAJo,1804
 avrs/requests/vehicle_input.py,sha256=R1b1xkRtOBkwyU6OSN4bWVlYsIUroZG0WKbYbc4pEH8,729
 avrs/requests/vehicle_replay.py,sha256=nCAE21VNyKoeIjjXBGAihgOLO7zYHcu-HWvPZYxdQ2c,11099
-autoverse_cli-0.15.6.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
-autoverse_cli-0.15.6.dist-info/METADATA,sha256=sqc7xxvBENurbIEumRCVIlFV-FbVPacL8sfFVpNlMZM,3342
-autoverse_cli-0.15.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-autoverse_cli-0.15.6.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
-autoverse_cli-0.15.6.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
-autoverse_cli-0.15.6.dist-info/RECORD,,
+autoverse_cli-0.15.7.dist-info/LICENSE,sha256=d4eWXho-u18HkBsX4K21uHX_bBb2UXZSrJdsb7Z_JlM,2647
+autoverse_cli-0.15.7.dist-info/METADATA,sha256=B_0s8ztA6rnRhd_9s-GnmuZgOm1FXrTe1JFjB-1Pm14,3342
+autoverse_cli-0.15.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+autoverse_cli-0.15.7.dist-info/entry_points.txt,sha256=Cb9qsUyU5AKkklehCcvtfT0-N3SXbUEqvjze4iEU5kE,40
+autoverse_cli-0.15.7.dist-info/top_level.txt,sha256=-AJO2e4MCVej6hY0U84pu5NfMeMW5qaAPSMisDT5rmA,5
+autoverse_cli-0.15.7.dist-info/RECORD,,

avrs/app_version.py

@@ -2,7 +2,7 @@ import http.client
 import json
 
 def get_app_version():
-    return '0.15.6'
+    return '0.15.7'
 
 def check_app_is_latest():
     pass

avrs/race_cloud.py

@@ -430,11 +430,13 @@ class AvrsRaceCloud(AvrsApiRequest):
     def enable_peer_qos(self, args):
         print('enabling peer qos for id {} using ip address {}'.format(
             args.peer_id, args.ip))
-        enable_peer_qos(args.peer_id, args.ip)
+        out = enable_peer_qos(args.peer_id, args.ip)
+        print('{} {}'.format(out.out, out.err))
 
     def disable_peer_qos(self, args):
         print('disabling peer qos for id {}'.format(args.peer_id))
-        disable_peer_qos(args.peer_id)
+        out = disable_peer_qos(args.peer_id)
+        print('{} {}'.format(out.out, out.err))
 
     def fwd_api(self, args):
         # start a server that listens for http on some port and forwards

avrs/race_cloud_util.py

@@ -62,11 +62,37 @@ DEFAULT_RMW_QOS = '''
 </profiles>
 '''
 
+DEFAULT_RMW_CYCLONE = '''
+    <?xml version="1.0" encoding="UTF-8" ?>
+      <CycloneDDS>
+        <Domain id="any">
+            <Discovery>
+                <ParticipantIndex>auto</ParticipantIndex>
+                <Peers>
+                        <Peer address='127.0.0.1'/>
+                        <!--<Peer address='PEER_0'/>PEER0-->
+                        <!--<Peer address='PEER_1'/>PEER1-->
+                        <!--<Peer address='PEER_2'/>PEER2-->
+                        <!--<Peer address='PEER_3'/>PEER3-->
+                        <!--<Peer address='PEER_4'/>PEER4-->
+                        <!--<Peer address='PEER_5'/>PEER5-->
+                </Peers>
+            </Discovery>
+        </Domain>
+    </CycloneDDS>
+'''
+
 DISABLE_PEER_QOS_SCRIPT = '''
     QOS_FILE_PATH={qos_path}
+    CYCLONE_PATH={cyclone_path}
     PEER_ID={peer_id}
+
+    # for the origin rmw qos file
     sed -i -E "s,(<locator> <udpv4> <address>)(.+)(</address> </udpv4> </locator>)<!--(PEER$PEER_ID-->),<!--\\1PEER$PEER_ID\\3\\4,g" $QOS_FILE_PATH
 
+    # for the cyclone file
+    sed -i -E "s,(<Peer address=')(.+)('/>)<!--(PEER$PEER_ID-->),<!--\\1PEER$PEER_ID\\3\\4,g" $CYCLONE_PATH
+
     VCAN_NAME=vcan$PEER_ID
     if [[ -e $VCAN_NAME.lock ]]; then
         echo "stopping existing cannelloni connection with pid $(cat $VCAN_NAME.lock)"
@@ -77,9 +103,15 @@ DISABLE_PEER_QOS_SCRIPT = '''
 
 ENABLE_PEER_QOS_SCRIPT = '''
     QOS_FILE_PATH={qos_path}
+    CYCLONE_PATH={cyclone_path}
     PEER_ID={peer_id}
     PEER_ADDRESS={peer_ip}
+
+    # for the origin rmw qos file
     sed -i -E "s,(<!--?)(<locator> <udpv4> <address>)(.+)(</address> </udpv4> </locator>)(PEER$PEER_ID-->),\\2$PEER_ADDRESS\\4<!--\\5,g" $QOS_FILE_PATH
+
+    # for the cyclone file
+    sed -i -E "s,(<!--?)(<Peer address=')(.+)('/>)(PEER$PEER_ID-->),\\2$PEER_ADDRESS\\4<!--\\5,g" $CYCLONE_PATH
 '''
 
 CONNECT_PEER_VCAN_SCRIPT = '''
@@ -166,15 +198,25 @@ def get_sim_exe_path():
 def get_rmw_qos_path():
     return os.path.join(os.environ['HOME'], '.rmw_qos.xml')
 
+def get_rmw_cyclone_qos_path():
+    return os.path.join(os.environ['HOME'], '.cyclone.xml')
+
 def reset_rmw_qos():
     with open(get_rmw_qos_path(), 'w', encoding='utf-8') as f:
         f.write(DEFAULT_RMW_QOS)
 
+def reset_rmw_cyclone_qos():
+    with open(get_rmw_cyclone_qos_path(), 'w', encoding='utf-8') as f:
+        f.write(DEFAULT_RMW_CYCLONE)
+
 def disable_peer_qos(peer_id):
     if not os.path.isfile(get_rmw_qos_path()):
         reset_rmw_qos()
+    if not os.path.isfile(get_rmw_cyclone_qos_path()):
+        reset_rmw_cyclone_qos()
     pargs = {
         'qos_path': get_rmw_qos_path(),
+        'cyclone_path': get_rmw_cyclone_qos_path(),
         'peer_id': peer_id
     }
     return run_process(['bash', '-c',
@@ -184,6 +226,7 @@ def enable_peer_qos(peer_id, peer_ip):
     disable_peer_qos(peer_ip) # disable first
     pargs = {
         'qos_path': get_rmw_qos_path(),
+        'cyclone_path': get_rmw_cyclone_qos_path(),
         'peer_id': peer_id,
         'peer_ip': peer_ip
     }
@@ -252,6 +295,7 @@ def get_local_instance_ip():
 
 def reset_race_cloud_connection():
     reset_rmw_qos()
+    reset_rmw_cyclone_qos()
     run_process(['bash', '-c', 'rm ~/.simslot*']) # remove slot reservations
     run_process(['bash', '-c', 'rm ~/.vcan*']) # remove lock files
     bash_kill_process('cannelloni')