afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

initial work for mobility player dialog, added default sample1.xml to created gui directory, fixed issue with non modal dialogs

Browse source
This commit is contained in:
Blake Harnden 2019-11-26 11:32:48 -08:00
parent c1a8fada7a
commit bc026bb693
7 changed files with 397 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coretk/coretk/appconfig.py
View file

@ -20,6 +20,7 @@ CONFIG_PATH = HOME_PATH.joinpath("gui.yaml")
# local paths
LOCAL_ICONS_PATH = Path(__file__).parent.joinpath("icons").absolute()
LOCAL_BACKGROUND_PATH = Path(__file__).parent.joinpath("backgrounds").absolute()
LOCAL_XMLS_PATH = Path(__file__).parent.joinpath("xmls").absolute()
# configuration data
TERMINALS = [
@ -59,6 +60,9 @@ def check_directory():
for background in LOCAL_BACKGROUND_PATH.glob("*"):
new_background = BACKGROUNDS_PATH.joinpath(background.name)
shutil.copy(background, new_background)
for xml_file in LOCAL_XMLS_PATH.glob("*"):
new_xml = XML_PATH.joinpath(xml_file.name)
shutil.copy(xml_file, new_xml)
if "TERM" in os.environ:
terminal = TERMINALS[0]

30
coretk/coretk/coreclient.py
View file

@ -5,6 +5,7 @@ import logging
import os
from core.api.grpc import client, core_pb2
from coretk.dialogs.mobilityplayer import MobilityPlayerDialog
from coretk.dialogs.sessions import SessionsDialog
from coretk.interface import InterfaceManager
from coretk.nodeutils import NodeDraw, NodeUtils
@ -74,6 +75,7 @@ class CoreClient:
self.emane_config = None
self.service_configs = {}
self.file_configs = {}
self.mobility_players = {}
def reset(self):
# helpers
@ -91,6 +93,7 @@ class CoreClient:
self.emane_config = None
self.service_configs.clear()
self.file_configs.clear()
self.mobility_players.clear()
def set_observer(self, value):
self.observer = value
@ -119,8 +122,33 @@ class CoreClient:
if event.HasField("link_event"):
self.app.canvas.wireless_draw.handle_link_event(event.link_event)
elif event.HasField("session_event"):
if event.session_event.event <= core_pb2.SessionState.SHUTDOWN:
session_event = event.session_event
if session_event.event <= core_pb2.SessionState.SHUTDOWN:
self.state = event.session_event.event
# mobility start
elif session_event.event == 7:
node_id = session_event.node_id
if node_id not in self.mobility_players:
canvas_node = self.canvas_nodes[node_id]
dialog = MobilityPlayerDialog(self.app, self.app, canvas_node)
dialog.show()
self.mobility_players[node_id] = dialog
# mobility stop
elif session_event.event == 8:
node_id = session_event.node_id
if node_id not in self.mobility_players:
canvas_node = self.canvas_nodes[node_id]
dialog = MobilityPlayerDialog(self.app, self.app, canvas_node)
dialog.show()
self.mobility_players[node_id] = dialog
# mobility pause
elif session_event.event == 9:
node_id = session_event.node_id
if node_id not in self.mobility_players:
canvas_node = self.canvas_nodes[node_id]
dialog = MobilityPlayerDialog(self.app, self.app, canvas_node)
dialog.show()
self.mobility_players[node_id] = dialog
def handle_throughputs(self, event):
interface_throughputs = event.interface_throughputs

2
coretk/coretk/dialogs/dialog.py
View file

@ -29,4 +29,4 @@ class Dialog(tk.Toplevel):
if self.modal:
self.wait_visibility()
self.grab_set()
self.wait_window()
self.wait_window()

61
coretk/coretk/dialogs/mobilityplayer.py Normal file
View file

@ -0,0 +1,61 @@
from tkinter import ttk
from coretk.dialogs.dialog import Dialog
PAD = 5
class MobilityPlayerDialog(Dialog):
def __init__(self, master, app, canvas_node):
super().__init__(
master, app, f"{canvas_node.core_node.name} Mobility Player", modal=False
)
self.play_button = None
self.pause_button = None
self.stop_button = None
self.draw()
def draw(self):
self.top.columnconfigure(0, weight=1)
label = ttk.Label(self.top, text="File Name")
label.grid(sticky="ew", pady=PAD)
frame = ttk.Frame(self.top)
frame.grid(sticky="ew", pady=PAD)
frame.columnconfigure(0, weight=1)
progressbar = ttk.Progressbar(frame, mode="indeterminate")
progressbar.grid(row=0, column=0, sticky="ew", padx=PAD)
progressbar.start()
label = ttk.Label(frame, text="time")
label.grid(row=0, column=1)
frame = ttk.Frame(self.top)
frame.grid(sticky="ew", pady=PAD)
self.play_button = ttk.Button(frame, text="Play", command=self.click_play)
self.play_button.grid(row=0, column=0, sticky="ew", padx=PAD)
self.pause_button = ttk.Button(frame, text="Pause", command=self.click_pause)
self.pause_button.grid(row=0, column=1, sticky="ew", padx=PAD)
self.stop_button = ttk.Button(frame, text="Stop", command=self.click_stop)
self.stop_button.grid(row=0, column=2, sticky="ew", padx=PAD)
checkbutton = ttk.Checkbutton(frame, text="Loop?")
checkbutton.grid(row=0, column=3, padx=PAD)
label = ttk.Label(frame, text="rate 50 ms")
label.grid(row=0, column=4)
def clear_buttons(self):
self.play_button.state(["!pressed"])
self.pause_button.state(["!pressed"])
self.stop_button.state(["!pressed"])
def click_play(self):
self.clear_buttons()
self.play_button.state(["pressed"])
def click_pause(self):
self.clear_buttons()
self.pause_button.state(["pressed"])
def click_stop(self):
self.clear_buttons()
self.stop_button.state(["pressed"])

11
coretk/coretk/linkinfo.py
View file

@ -2,10 +2,10 @@
Link information, such as IPv4, IPv6 and throughput drawn in the canvas
"""
import logging
import math
import tkinter as tk
from tkinter import font
TEXT_DISTANCE = 0.33
TEXT_DISTANCE = 0.30
class LinkInfo:
@ -21,20 +21,19 @@ class LinkInfo:
self.link = link
self.id1 = None
self.id2 = None
self.font = font.Font(size=8)
self.draw_labels()
def get_coordinates(self):
x1, y1, x2, y2 = self.canvas.coords(self.edge.id)
v1 = x2 - x1
v2 = y2 - y1
d = math.sqrt(v1 ** 2 + v2 ** 2)
ux = TEXT_DISTANCE * v1
uy = TEXT_DISTANCE * v2
x1 = x1 + ux
y1 = y1 + uy
x2 = x2 - ux
y2 = y2 - uy
logging.info("line distance: %s", d)
return x1, y1, x2, y2
def draw_labels(self):
@ -52,10 +51,10 @@ class LinkInfo:
f"{self.link.interface_two.ip6}/{self.link.interface_two.ip6mask}\n"
)
self.id1 = self.canvas.create_text(
x1, y1, text=label_one, justify=tk.CENTER, tags="linkinfo"
x1, y1, text=label_one, justify=tk.CENTER, font=self.font, tags="linkinfo"
)
self.id2 = self.canvas.create_text(
x2, y2, text=label_two, justify=tk.CENTER, tags="linkinfo"
x2, y2, text=label_two, justify=tk.CENTER, font=self.font, tags="linkinfo"
)
def recalculate_info(self):

2
coretk/coretk/menuaction.py
View file

@ -76,7 +76,7 @@ class MenuAction:
file_path = filedialog.askopenfilename(
initialdir=str(XML_PATH),
title="Open",
filetypes=(("EmulationScript XML File", "*.xml"), ("All Files", "*")),
filetypes=(("XML Files", "*.xml"), ("All Files", "*")),
)
if file_path:
logging.info("opening xml: %s", file_path)

296
coretk/coretk/xmls/sample1.xml Normal file
View file

@ -0,0 +1,296 @@
<?xml version='1.0' encoding='UTF-8'?>
<scenario name="/home/developer/.core/configs/sample1.xml">
<networks>
<network id="4" name="n4" type="SWITCH">
<position x="192" y="252" lat="47.575772687635684" lon="-122.12854846773448" alt="2.0"/>
</network>
<network id="10" name="wlan10" model="basic_range" mobility="ns2script" type="WIRELESS_LAN">
<position x="852" y="564" lat="47.571461367642975" lon="-122.11545692141004" alt="2.0"/>
</network>
</networks>
<devices>
<device id="1" name="n1" type="router">
<position x="384" y="456" lat="47.57299046758095" lon="-122.12476526017994" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv2"/>
<service name="OSPFv3"/>
<service name="IPForward"/>
</services>
</device>
<device id="2" name="n2" type="router">
<position x="264" y="432" lat="47.573332594055614" lon="-122.12715293067248" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv2"/>
<service name="OSPFv3"/>
<service name="IPForward"/>
</services>
</device>
<device id="3" name="n3" type="router">
<position x="120" y="360" lat="47.574326082855684" lon="-122.13000852028551" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv2"/>
<service name="OSPFv3"/>
<service name="IPForward"/>
</services>
</device>
<device id="5" name="n5" type="mdr">
<position x="540" y="348" lat="47.57442418842964" lon="-122.12162992068025" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv2"/>
<service name="OSPFv3MDR"/>
<service name="IPForward"/>
</services>
</device>
<device id="6" name="n6" type="mdr">
<position x="780" y="228" z="0" lat="47.57600687921956" lon="-122.11681646305682" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv3MDR"/>
<service name="IPForward"/>
</services>
</device>
<device id="7" name="n7" type="mdr">
<position x="816" y="348" z="0" lat="47.57438190375045" lon="-122.11612576237813" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv3MDR"/>
<service name="IPForward"/>
</services>
</device>
<device id="8" name="n8" type="mdr">
<position x="672" y="420" z="0" lat="47.57343233042518" lon="-122.11901379398057" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv3MDR"/>
<service name="IPForward"/>
</services>
</device>
<device id="9" name="n9" type="mdr">
<position x="672" y="96" z="0" lat="47.5778048343963" lon="-122.1189404444248" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv3MDR"/>
<service name="IPForward"/>
</services>
</device>
<device id="11" name="n11" type="PC">
<position x="192" y="156" lat="47.57706824749672" lon="-122.12852696975362" alt="2.0"/>
<services>
<service name="DefaultRoute"/>
</services>
</device>
<device id="12" name="n12" type="PC">
<position x="264" y="156" lat="47.57705732805345" lon="-122.12709102623127" alt="2.0"/>
<services>
<service name="DefaultRoute"/>
</services>
</device>
<device id="13" name="n13" type="PC">
<position x="336" y="156" lat="47.57704639063606" lon="-122.1256550835562" alt="2.0"/>
<services>
<service name="DefaultRoute"/>
</services>
</device>
<device id="14" name="n14" type="host">
<position x="348" y="228" lat="47.5760728969193" lon="-122.12543194103064" alt="2.0"/>
<services>
<service name="DefaultRoute"/>
<service name="SSH"/>
</services>
</device>
<device id="15" name="n15" type="router">
<position x="384" y="312" lat="47.57493380624855" lon="-122.12473287581267" alt="2.0"/>
<services>
<service name="zebra"/>
<service name="OSPFv2"/>
<service name="OSPFv3"/>
<service name="IPForward"/>
</services>
</device>
</devices>
<links>
<link node_one="4" node_two="3">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:05" ip4="10.0.1.1" ip4_mask="24" ip6="a:1::1" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="4" node_two="11">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:10" ip4="10.0.1.20" ip4_mask="24" ip6="a:1::20" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="4" node_two="12">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:11" ip4="10.0.1.21" ip4_mask="24" ip6="a:1::21" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="4" node_two="13">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:12" ip4="10.0.1.22" ip4_mask="24" ip6="a:1::22" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="4" node_two="14">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:13" ip4="10.0.1.10" ip4_mask="24" ip6="a:1::10" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="10" node_two="8">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:00" ip4="10.0.0.8" ip4_mask="32" ip6="a::8" ip6_mask="128"/>
<options delay="50000" bandwidth="54000000" per="0.0" dup="0" jitter="0" type="0" unidirectional="0"/>
</link>
<link node_one="10" node_two="7">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:01" ip4="10.0.0.7" ip4_mask="32" ip6="a::7" ip6_mask="128"/>
<options delay="50000" bandwidth="54000000" per="0.0" dup="0" jitter="0" type="0" unidirectional="0"/>
</link>
<link node_one="10" node_two="5">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:02" ip4="10.0.0.5" ip4_mask="32" ip6="a::3" ip6_mask="128"/>
<options delay="50000" bandwidth="54000000" per="0.0" dup="0" jitter="0" type="0" unidirectional="0"/>
</link>
<link node_one="10" node_two="6">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:03" ip4="10.0.0.6" ip4_mask="32" ip6="a::6" ip6_mask="128"/>
<options delay="50000" bandwidth="54000000" per="0.0" dup="0" jitter="0" type="0" unidirectional="0"/>
</link>
<link node_one="10" node_two="9">
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:04" ip4="10.0.0.9" ip4_mask="32" ip6="a::9" ip6_mask="128"/>
<options delay="50000" bandwidth="54000000" per="0.0" dup="0" jitter="0" type="0" unidirectional="0"/>
</link>
<link node_one="3" node_two="2">
<interface_one id="1" name="eth1" mac="00:00:00:aa:00:06" ip4="10.0.2.1" ip4_mask="24" ip6="a:2::1" ip6_mask="64"/>
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:07" ip4="10.0.2.2" ip4_mask="24" ip6="a:2::2" ip6_mask="64"/>
<options delay="25000" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="2" node_two="1">
<interface_one id="1" name="eth1" mac="00:00:00:aa:00:08" ip4="10.0.3.1" ip4_mask="24" ip6="a:3::1" ip6_mask="64"/>
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:09" ip4="10.0.3.2" ip4_mask="24" ip6="a:3::2" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="2" node_two="15">
<interface_one id="2" name="eth2" mac="00:00:00:aa:00:0a" ip4="10.0.4.1" ip4_mask="24" ip6="a:4::1" ip6_mask="64"/>
<interface_two id="0" name="eth0" mac="00:00:00:aa:00:0b" ip4="10.0.4.2" ip4_mask="24" ip6="a:4::2" ip6_mask="64"/>
<options delay="50000" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="1" node_two="15">
<interface_one id="1" name="eth1" mac="00:00:00:aa:00:0c" ip4="10.0.5.1" ip4_mask="24" ip6="a:5::1" ip6_mask="64"/>
<interface_two id="1" name="eth1" mac="00:00:00:aa:00:0d" ip4="10.0.5.2" ip4_mask="24" ip6="a:5::2" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
<link node_one="15" node_two="5">
<interface_one id="2" name="eth2" mac="00:00:00:aa:00:0e" ip4="10.0.6.1" ip4_mask="24" ip6="a:6::1" ip6_mask="64"/>
<interface_two id="1" name="eth1" mac="00:00:00:aa:00:0f" ip4="10.0.6.2" ip4_mask="24" ip6="a:6::2" ip6_mask="64"/>
<options delay="0" bandwidth="100000000" per="0.0" dup="0" jitter="0" type="1" unidirectional="0"/>
</link>
</links>
<mobility_configurations>
<mobility_configuration node="10" model="basic_range">
<configuration name="range" value="240"/>
<configuration name="bandwidth" value="54000000"/>
<configuration name="jitter" value="0"/>
<configuration name="delay" value="50000"/>
<configuration name="error" value="0"/>
</mobility_configuration>
<mobility_configuration node="10" model="ns2script">
<configuration name="file" value="sample1.scen"/>
<configuration name="refresh_ms" value="50"/>
<configuration name="loop" value="1"/>
<configuration name="autostart" value="5"/>
<configuration name="map" value=""/>
<configuration name="script_start" value=""/>
<configuration name="script_pause" value=""/>
<configuration name="script_stop" value=""/>
</mobility_configuration>
</mobility_configurations>
<service_configurations>
<service name="zebra" node="5">
<directories>
<directory>/usr/local/etc/quagga</directory>
<directory>/var/run/quagga</directory>
</directories>
<startups>
<startup>sh quaggaboot.sh zebra</startup>
</startups>
<validates>
<validate>pidof zebra</validate>
</validates>
<shutdowns>
<shutdown>killall zebra</shutdown>
</shutdowns>
<files>
<file name="/usr/local/etc/quagga/Quagga.conf">interface eth0
ip address 10.0.0.5/32
ipv6 address a::3/128
ipv6 ospf6 instance-id 65
ipv6 ospf6 hello-interval 2
ipv6 ospf6 dead-interval 6
ipv6 ospf6 retransmit-interval 5
ipv6 ospf6 network manet-designated-router
ipv6 ospf6 diffhellos
ipv6 ospf6 adjacencyconnectivity uniconnected
ipv6 ospf6 lsafullness mincostlsa
!
interface eth1
ip address 10.0.6.2/24
!ip ospf hello-interval 2
!ip ospf dead-interval 6
!ip ospf retransmit-interval 5
!ip ospf network point-to-point
ipv6 address a:6::2/64
!
router ospf
router-id 10.0.0.5
network 10.0.0.5/32 area 0
network 10.0.6.0/24 area 0
redistribute connected metric-type 1
redistribute ospf6 metric-type 1
!
router ospf6
router-id 10.0.0.5
interface eth0 area 0.0.0.0
redistribute connected
redistribute ospf
!
</file>
</files>
</service>
</service_configurations>
<session_origin lat="47.5791667" lon="-122.132322" alt="2.0" scale="150.0"/>
<session_options>
<configuration name="controlnet" value=""/>
<configuration name="controlnet0" value=""/>
<configuration name="controlnet1" value=""/>
<configuration name="controlnet2" value=""/>
<configuration name="controlnet3" value=""/>
<configuration name="controlnet_updown_script" value=""/>
<configuration name="enablerj45" value="1"/>
<configuration name="preservedir" value="0"/>
<configuration name="enablesdt" value="0"/>
<configuration name="sdturl" value="tcp://127.0.0.1:50000/"/>
</session_options>
<session_metadata>
<configuration name="annotation a0" value="{iconcoords {612.0 492.0}} {type text} {label {wireless network}} {labelcolor black} {fontfamily {Arial}} {fontsize {12}} {effects {bold}} {canvas c1}"/>
<configuration name="annotation a1" value="{iconcoords {142.0 112.0 393.0 291.0}} {type rectangle} {label {}} {labelcolor black} {fontfamily {Arial}} {fontsize {12}} {color #ebebde} {width 1} {border #ffffff} {rad 25} {canvas c1}"/>
<configuration name="annotation a2" value="{iconcoords {492.0 384.0}} {type text} {label {gateway}} {labelcolor black} {fontfamily {Arial}} {fontsize {12}} {effects {bold}} {canvas c1}"/>
<configuration name="canvas c1" value="{name {Canvas1}} {wallpaper-style {upperleft}} {wallpaper {sample1-bg.gif}}"/>
<configuration name="global_options" value="interface_names=no ip_addresses=yes ipv6_addresses=no node_labels=yes link_labels=yes show_api=no background_images=no annotations=yes grid=no traffic_start=0"/>
</session_metadata>
<default_services>
<node type="mdr">
<service name="zebra"/>
<service name="OSPFv3MDR"/>
<service name="IPForward"/>
</node>
<node type="PC">
<service name="DefaultRoute"/>
</node>
<node type="prouter"/>
<node type="router">
<service name="zebra"/>
<service name="OSPFv2"/>
<service name="OSPFv3"/>
<service name="IPForward"/>
</node>
<node type="host">
<service name="DefaultRoute"/>
<service name="SSH"/>
</node>
</default_services>
</scenario>