diff options
author | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2015-03-01 21:13:15 +0000 |
---|---|---|
committer | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2015-03-01 21:13:15 +0000 |
commit | fc8be19f7ba116d451b03b2ad8f881350e4d00d6 (patch) | |
tree | 63d463ec74158907b9fddb6d5a938f3a8158f77d /kpov_judge/tasks/vlc_stream_rtp | |
parent | 30b6118d188230890b1d7093fa93d1a0bd7e3b32 (diff) |
Continued work on nat_port_forward and vlc_stream_rtp
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@283 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
Diffstat (limited to 'kpov_judge/tasks/vlc_stream_rtp')
-rw-r--r-- | kpov_judge/tasks/vlc_stream_rtp/task.py | 90 |
1 files changed, 17 insertions, 73 deletions
diff --git a/kpov_judge/tasks/vlc_stream_rtp/task.py b/kpov_judge/tasks/vlc_stream_rtp/task.py index 2878f62..12c0c53 100644 --- a/kpov_judge/tasks/vlc_stream_rtp/task.py +++ b/kpov_judge/tasks/vlc_stream_rtp/task.py @@ -8,56 +8,25 @@ instructions = { 'si':u""" Postavi navidezni računalnik SimpleArbiter z diska simpleArbiter. Posodobi datoteko /etc/apt/sources.list -preveri za posodobitve in naloži VLC. Odpri VLC in izberi Media, nato pa Stream. V oknu izberi zavihek -Network in izberi streamanje preko RTP. Preberi naslov filma ter določi ime toka: TOK, vpiši multicast -naslov, določi še ostale za streamanje nastavitve in začni s streamanjem. -Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na Internetu prek RTP z imenom toka -TOK. Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic je pri reševanju te naloge +preveri za posodobitve in naloži VLC. +Posnemi ali kako drugače ustvari film ter poskrbi, da bo film dostopen na lokalnem omrežju prek RTP z imenom toka TOK na naslovu NASLOV. Računaj, da bodo film lahko videli tvoji sošolci. Kršenje avtorskih pravic je pri reševanju te naloge strogo prepovedano. """ 'en':u""" Set up a virtual computer SimpleArbiter from the simpleArbiter disk. Read a movie title and stream name for stream TOK onto simpleArbiter. Film or -otherwise create a movie and make sure the movie is avaliable on the internet -via RTP with the name of the stream TOK. Take into account that the movie will -be seen by your classmates. Copyright infrigement while solving this task is +otherwise create a movie and make sure the movie is avaliable on your local network +via RTP with the name of the stream TOK on the address NASLOV. +Take into account that the movie may be seen by your classmates. Copyright infrigement while solving this task is prohibited. """ } computers = { - 'maliNetworkManager': { - 'disks': [ - { 'name': 'maliNetworkManager', - }, - #{ 'name': 'CDROM', - # 'options':{'readonly': True}, - # 'parts': [],# no parts, no mounting. - #} - ], - 'network_interfaces': [{'network': 'net1'}], - 'flavor': 'm1.tiny', - 'config_drive': False - - }, - 'maliBrezNetworkManager': { - 'disks': [ - { 'name': 'maliBrezNetworkManager', - }, - #{ 'name': 'CDROM', - # 'options':{'readonly': True}, - # 'parts': [],# no parts, no mounting. - #} - ], - 'network_interfaces': [{'network': 'net1'}], - 'flavor': 'm1.tiny', - 'config_drive': False - - }, 'SimpleArbiter': { 'disks': [ - { 'name': 'simpleArbiterDhcp', + { 'name': 'simpleArbiter', # attempt automount }, #{ 'name': 'CDROM', @@ -71,60 +40,35 @@ computers = { } } -networks = { 'net1': {'public': False}, 'test-net': {'public': True} } +networks = { 'test-net': {'public': True} } params_meta = { - 'IP_NM': {'descriptions': {'si': 'Naslov maliNetworkManager'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True}, - 'DNS_NM': {'descriptions': {'si': 'DNS za maliNetworkManager'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True}, - 'IP_static': {'descriptions': {'si': 'Naslov maliBrezNetworkManager'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True}, - 'DNS_static': {'descriptions': {'si': 'DNS za maliBrezNetworkManager'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True}, + 'NASLOV': {'descriptions': {'si': 'RTP multicast IP naslov'}, 'w': False, 'public':True, 'type': 'stream_name', 'generated': True}, + 'TOK': {'descriptions': {'si': 'Naslov toka'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True}, } -def task(IP_NM, DNS_NM, IP_static, DNS_static): - import pxssh +def task(NASLOV, TOK): import pexpect - results = dict() - peer_user = 'student' - peer_passwd = 'vaje' - sA = pxssh.pxssh() - sB = pxssh.pxssh() - sA.login(IP_NM, peer_user, peer_passwd) - sB.login(IP_static, peer_user, peer_passwd) # sA # make sure NM is not handling eth0 - results['NM_nmcli'] = sA.run('nmcli d') - results['NM_nslookup'] = sA.run('nslookup www.arnes.si') # sB # check whether NM is handling eth0 - results['static_nmcli'] = sB.run('nmcli d') - results['static_nslookup'] = sB.run('nslookup www.arnes.si') - sA.logout() - sB.logout() + results['ps'] = pexpect.run('ps xa') + results['tcpdump'] = pexpect.run('tcpdump') return results def gen_params(user_id, params_meta): params = dict() r = random.Random(user_id) - # IP_NM, DNS_NM, IP_static, DNS_static) - dns_servers = ['193.2.1.66', '193.2.1.72', '8.8.8.8', '8.8.4.4', '208.67.222.222', '208.67.220.220'] - net = kpov_random_helpers.IPv4_subnet_gen(r, '172.23.128.0/18', 24) - params['DNS_NM'] = r.choice(dns_servers) - params['IP_NM'], params['IP_static'] = kpov_random_helpers.IPv4_addr_gen(r, net, 2) - params['DNS_static'] = r.choice(dns_servers) + net = kpov_random_helpers.IPv4_net_gen(r, min_hosts = 16, + public=True, multicast=True) + params['NASLOV'] = kpov_random_helpers.IPv4_addr_gen(r, net, 1)[0] + params['TOK'] = kpov_random_helpers.hostname_gen(r) return params def task_check(results, params): import re - score = -9 - if results['NM_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_NM'])) > -1: - score += 3 - if results['static_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_static'])) > -1: - score += 3 - if re.search(r'eth0 +802-.*connected', results['NM_nmcli']): - score += 2 - if not re.search(r'eth0 +802-.*connected', results['static_nmcli']): - score += 2 - score = 0 + print results return score def prepare_disks(templates, params): |