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

pygui: modified usages of protobufs within coreclient to use module namespace to make more obvious, replaced config services and services with wrappers

Browse source
This commit is contained in:
Blake Harnden 2020-07-25 20:27:11 -07:00
parent a9a2fb8e46
commit 82a212d1cf
6 changed files with 213 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/core/gui/dialogs/configserviceconfig.py
View file

@ -8,11 +8,10 @@ from typing import TYPE_CHECKING, Dict, List, Optional, Set
import grpc
from core.api.grpc.services_pb2 import ServiceValidationMode
from core.gui.dialogs.dialog import Dialog
from core.gui.themes import FRAME_PAD, PADX, PADY
from core.gui.widgets import CodeText, ConfigFrame, ListboxScroll
from core.gui.wrappers import ConfigOption
from core.gui.wrappers import ConfigOption, ServiceValidationMode
if TYPE_CHECKING:
from core.gui.app import Application

9
daemon/core/gui/dialogs/mobilityplayer.py
View file

@ -4,11 +4,10 @@ from typing import TYPE_CHECKING, Dict, Optional
import grpc
from core.api.grpc.mobility_pb2 import MobilityAction
from core.gui.dialogs.dialog import Dialog
from core.gui.images import ImageEnum
from core.gui.themes import PADX, PADY
from core.gui.wrappers import ConfigOption, Node
from core.gui.wrappers import ConfigOption, MobilityAction, Node
if TYPE_CHECKING:
from core.gui.app import Application
@ -150,7 +149,7 @@ class MobilityPlayerDialog(Dialog):
session_id = self.app.core.session_id
try:
self.app.core.client.mobility_action(
session_id, self.node.id, MobilityAction.START
session_id, self.node.id, MobilityAction.START.value
)
except grpc.RpcError as e:
self.app.show_grpc_exception("Mobility Error", e)
@ -160,7 +159,7 @@ class MobilityPlayerDialog(Dialog):
session_id = self.app.core.session_id
try:
self.app.core.client.mobility_action(
session_id, self.node.id, MobilityAction.PAUSE
session_id, self.node.id, MobilityAction.PAUSE.value
)
except grpc.RpcError as e:
self.app.show_grpc_exception("Mobility Error", e)
@ -170,7 +169,7 @@ class MobilityPlayerDialog(Dialog):
session_id = self.app.core.session_id
try:
self.app.core.client.mobility_action(
session_id, self.node.id, MobilityAction.STOP
session_id, self.node.id, MobilityAction.STOP.value
)
except grpc.RpcError as e:
self.app.show_grpc_exception("Mobility Error", e)

4
daemon/core/gui/dialogs/serviceconfig.py
View file

@ -7,12 +7,12 @@ from typing import TYPE_CHECKING, Dict, List, Optional, Set, Tuple
import grpc
from PIL.ImageTk import PhotoImage
from core.api.grpc.services_pb2 import NodeServiceData, ServiceValidationMode
from core.gui.dialogs.copyserviceconfig import CopyServiceConfigDialog
from core.gui.dialogs.dialog import Dialog
from core.gui.images import ImageEnum, Images
from core.gui.themes import FRAME_PAD, PADX, PADY
from core.gui.widgets import CodeText, ListboxScroll
from core.gui.wrappers import NodeServiceData, ServiceValidationMode
if TYPE_CHECKING:
from core.gui.app import Application
@ -72,7 +72,7 @@ class ServiceConfigDialog(Dialog):
self.service_file_data: Optional[CodeText] = None
self.validation_period_entry: Optional[ttk.Entry] = None
self.original_service_files: Dict[str, str] = {}
self.default_config: NodeServiceData = None
self.default_config: Optional[NodeServiceData] = None
self.temp_service_files: Dict[str, str] = {}
self.modified_files: Set[str] = set()
self.has_error: bool = False