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

Merge branch 'rel/5.3' of git-ssh.web.boeing.com:Boeing-CORE/CORE into rel/5.3

Browse source
This commit is contained in:
bharnden 2018-11-22 00:14:09 -08:00
commit d522649489
39 changed files with 297 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
corefx/src/main/java/com/core/Controller.java
View file

@ -1,12 +1,13 @@
package com.core;
import com.core.client.ICoreClient;
import com.core.client.rest.*;
import com.core.client.rest.CoreRestClient;
import com.core.data.*;
import com.core.graph.NetworkGraph;
import com.core.ui.*;
import com.core.ui.dialogs.*;
import com.core.utils.ConfigUtils;
import com.core.utils.Configuration;
import com.core.websocket.CoreWebSocket;
import com.jfoenix.controls.JFXProgressBar;
import javafx.application.Application;
@ -48,7 +49,7 @@ public class Controller implements Initializable {
private Application application;
private Stage window;
private Properties properties;
private Configuration configuration;
// core client utilities
private ICoreClient coreClient = new CoreRestClient();
@ -96,30 +97,30 @@ public class Controller implements Initializable {
}
private void initialJoin() throws IOException {
GetServices services = coreClient.getServices();
logger.info("core services: {}", services);
nodeServicesDialog.setServices(services);
Map<String, List<String>> serviceGroups = coreClient.getServices();
logger.info("core services: {}", serviceGroups);
nodeServicesDialog.setServices(serviceGroups);
logger.info("initial core session join");
GetSessions response = coreClient.getSessions();
List<SessionOverview> sessions = coreClient.getSessions();
logger.info("existing sessions: {}", response);
logger.info("existing sessions: {}", sessions);
Integer sessionId;
if (response.getSessions().isEmpty()) {
if (sessions.isEmpty()) {
logger.info("creating initial session");
CreatedSession createdSession = coreClient.createSession();
sessionId = createdSession.getId();
SessionOverview sessionOverview = coreClient.createSession();
sessionId = sessionOverview.getId();
Toast.info(String.format("Created Session %s", sessionId));
} else {
GetSessionsData getSessionsData = response.getSessions().get(0);
sessionId = getSessionsData.getId();
SessionOverview sessionOverview = sessions.get(0);
sessionId = sessionOverview.getId();
Toast.info(String.format("Joined Session %s", sessionId));
}
joinSession(sessionId);
// set emane models
List<String> emaneModels = coreClient.getEmaneModels().getModels();
List<String> emaneModels = coreClient.getEmaneModels();
nodeEmaneDialog.setModels(emaneModels);
}
@ -127,8 +128,12 @@ public class Controller implements Initializable {
// clear graph
networkGraph.reset();
// clear out any previously set information
bottom.getChildren().remove(mobilityPlayer);
mobilityDialog.setNode(null);
// get session to join
GetSession session = coreClient.getSession(joinId);
Session session = coreClient.getSession(joinId);
SessionState sessionState = SessionState.get(session.getState());
// update client to use this session
@ -164,13 +169,14 @@ public class Controller implements Initializable {
// update other components for new session
graphToolbar.setRunButton(coreClient.isRunning());
hooksDialog.updateHooks();
nodeTypesDialog.updateDefaultServices();
// display first mobility script in player
GetMobilityConfigs getMobilityConfigs = coreClient.getMobilityConfigs();
Optional<Integer> nodeIdOptional = getMobilityConfigs.getConfigurations().keySet().stream().findFirst();
Map<Integer, MobilityConfig> mobilityConfigMap = coreClient.getMobilityConfigs();
Optional<Integer> nodeIdOptional = mobilityConfigMap.keySet().stream().findFirst();
if (nodeIdOptional.isPresent()) {
Integer nodeId = nodeIdOptional.get();
MobilityConfig mobilityConfig = getMobilityConfigs.getConfigurations().get(nodeId);
MobilityConfig mobilityConfig = mobilityConfigMap.get(nodeId);
CoreNode node = networkGraph.getVertex(nodeId);
mobilityPlayer.show(node, mobilityConfig);
Platform.runLater(() -> bottom.getChildren().add(mobilityPlayer));
@ -294,20 +300,27 @@ public class Controller implements Initializable {
private void onOpenXmlAction() {
FileChooser fileChooser = new FileChooser();
fileChooser.setTitle("Open Session");
String xmlPath = properties.getProperty(ConfigUtils.XML_PATH);
fileChooser.setInitialDirectory(new File(xmlPath));
fileChooser.setInitialDirectory(new File(configuration.getXmlPath()));
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("XML", "*.xml"));
File file = fileChooser.showOpenDialog(window);
if (file != null) {
logger.info("opening session xml: {}", file.getPath());
try {
CreatedSession createdSession = coreClient.openSession(file);
Integer sessionId = createdSession.getId();
joinSession(sessionId);
Toast.info(String.format("Joined Session %s", sessionId));
} catch (IOException ex) {
logger.error("error opening session xml", ex);
try {
File file = fileChooser.showOpenDialog(window);
if (file != null) {
openXml(file);
}
} catch (IllegalArgumentException ex) {
Toast.error(String.format("Invalid XML directory: %s", configuration.getXmlPath()));
}
}
private void openXml(File file) {
logger.info("opening session xml: {}", file.getPath());
try {
SessionOverview sessionOverview = coreClient.openSession(file);
Integer sessionId = sessionOverview.getId();
joinSession(sessionId);
Toast.info(String.format("Joined Session %s", sessionId));
} catch (IOException ex) {
Toast.error("Error opening session xml", ex);
}
}
@ -316,8 +329,7 @@ public class Controller implements Initializable {
FileChooser fileChooser = new FileChooser();
fileChooser.setTitle("Save Session");
fileChooser.setInitialFileName("session.xml");
String xmlPath = properties.getProperty(ConfigUtils.XML_PATH);
fileChooser.setInitialDirectory(new File(xmlPath));
fileChooser.setInitialDirectory(new File(configuration.getXmlPath()));
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("XML", "*.xml"));
File file = fileChooser.showSaveDialog(window);
if (file != null) {
@ -325,7 +337,7 @@ public class Controller implements Initializable {
try {
coreClient.saveSession(file);
} catch (IOException ex) {
logger.error("error saving session xml", ex);
Toast.error("Error saving session xml", ex);
}
}
}
@ -348,12 +360,11 @@ public class Controller implements Initializable {
@FXML
private void onSessionOptionsMenu(ActionEvent event) {
try {
GetConfig config = coreClient.getSessionConfig();
configDialog.showDialog("Session Options", config, () -> {
List<ConfigGroup> configGroups = coreClient.getSessionConfig();
configDialog.showDialog("Session Options", configGroups, () -> {
List<ConfigOption> options = configDialog.getOptions();
SetConfig setConfig = new SetConfig(options);
try {
boolean result = coreClient.setSessionConfig(setConfig);
boolean result = coreClient.setSessionConfig(options);
if (result) {
Toast.info("Session options saved");
} else {
@ -381,8 +392,8 @@ public class Controller implements Initializable {
@Override
public void initialize(URL location, ResourceBundle resources) {
coreWebSocket = new CoreWebSocket(this);
properties = ConfigUtils.load();
String coreUrl = properties.getProperty(ConfigUtils.REST_URL);
configuration = ConfigUtils.load();
String coreUrl = configuration.getCoreRest();
logger.info("core rest: {}", coreUrl);
connectDialog.setCoreUrl(coreUrl);
connectToCore(coreUrl);

30
corefx/src/main/java/com/core/client/ICoreClient.java
View file

@ -1,12 +1,14 @@
package com.core.client;
import com.core.client.rest.*;
import com.core.client.rest.ServiceFile;
import com.core.client.rest.WlanConfig;
import com.core.data.*;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
public interface ICoreClient {
void setUrl(String url);
@ -15,11 +17,11 @@ public interface ICoreClient {
void updateState(SessionState state);
CreatedSession createSession() throws IOException;
SessionOverview createSession() throws IOException;
GetSessions getSessions() throws IOException;
List<SessionOverview> getSessions() throws IOException;
GetSession getSession(Integer sessionId) throws IOException;
Session getSession(Integer sessionId) throws IOException;
boolean start(Collection<CoreNode> nodes, Collection<CoreLink> links, List<Hook> hooks) throws IOException;
@ -27,7 +29,9 @@ public interface ICoreClient {
boolean setState(SessionState state) throws IOException;
GetServices getServices() throws IOException;
Map<String, List<String>> getServices() throws IOException;
Map<String, List<String>> defaultServices() throws IOException;
CoreService getService(CoreNode node, String serviceName) throws IOException;
@ -37,13 +41,13 @@ public interface ICoreClient {
boolean setServiceFile(CoreNode node, String serviceName, ServiceFile serviceFile) throws IOException;
GetConfig getEmaneConfig(CoreNode node) throws IOException;
List<ConfigGroup> getEmaneConfig(CoreNode node) throws IOException;
GetEmaneModels getEmaneModels() throws IOException;
List<String> getEmaneModels() throws IOException;
boolean setEmaneConfig(CoreNode node, List<ConfigOption> options) throws IOException;
GetConfig getEmaneModelConfig(Integer id, String model) throws IOException;
List<ConfigGroup> getEmaneModelConfig(Integer id, String model) throws IOException;
boolean setEmaneModelConfig(Integer id, String model, List<ConfigOption> options) throws IOException;
@ -51,11 +55,11 @@ public interface ICoreClient {
void saveSession(File file) throws IOException;
CreatedSession openSession(File file) throws IOException;
SessionOverview openSession(File file) throws IOException;
GetConfig getSessionConfig() throws IOException;
List<ConfigGroup> getSessionConfig() throws IOException;
boolean setSessionConfig(SetConfig config) throws IOException;
boolean setSessionConfig(List<ConfigOption> configOptions) throws IOException;
boolean createNode(CoreNode node) throws IOException;
@ -69,7 +73,7 @@ public interface ICoreClient {
boolean createHook(Hook hook) throws IOException;
GetHooks getHooks() throws IOException;
List<Hook> getHooks() throws IOException;
WlanConfig getWlanConfig(CoreNode node) throws IOException;
@ -77,7 +81,7 @@ public interface ICoreClient {
String getTerminalCommand(CoreNode node) throws IOException;
GetMobilityConfigs getMobilityConfigs() throws IOException;
Map<Integer, MobilityConfig> getMobilityConfigs() throws IOException;
boolean setMobilityConfig(CoreNode node, MobilityConfig config) throws IOException;

64
corefx/src/main/java/com/core/client/rest/CoreRestClient.java
View file

@ -41,27 +41,29 @@ public class CoreRestClient implements ICoreClient {
}
@Override
public CreatedSession createSession() throws IOException {
public SessionOverview createSession() throws IOException {
String url = getUrl("sessions");
return WebUtils.post(url, CreatedSession.class);
return WebUtils.post(url, SessionOverview.class);
}
public GetServices getServices() throws IOException {
public Map<String, List<String>> getServices() throws IOException {
String url = getUrl("services");
return WebUtils.getJson(url, GetServices.class);
GetServices getServices = WebUtils.getJson(url, GetServices.class);
return getServices.getGroups();
}
@Override
public GetSession getSession(Integer sessionId) throws IOException {
public Session getSession(Integer sessionId) throws IOException {
String path = String.format("sessions/%s", sessionId);
String url = getUrl(path);
return WebUtils.getJson(url, GetSession.class);
return WebUtils.getJson(url, Session.class);
}
@Override
public GetSessions getSessions() throws IOException {
public List<SessionOverview> getSessions() throws IOException {
String url = getUrl("sessions");
return WebUtils.getJson(url, GetSessions.class);
GetSessions getSessions = WebUtils.getJson(url, GetSessions.class);
return getSessions.getSessions();
}
@Override
@ -126,6 +128,13 @@ public class CoreRestClient implements ICoreClient {
return WebUtils.postFile(url, file);
}
@Override
public Map<String, List<String>> defaultServices() throws IOException {
String url = getUrl(String.format("sessions/%s/services/default", sessionId));
GetDefaultServices getDefaultServices = WebUtils.getJson(url, GetDefaultServices.class);
return getDefaultServices.getDefaults();
}
@Override
public CoreService getService(CoreNode node, String serviceName) throws IOException {
String url = getUrl(String.format("sessions/%s/nodes/%s/services/%s", sessionId, node.getId(), serviceName));
@ -155,26 +164,29 @@ public class CoreRestClient implements ICoreClient {
}
@Override
public GetEmaneModels getEmaneModels() throws IOException {
public List<String> getEmaneModels() throws IOException {
String url = getUrl(String.format("sessions/%s/emane/models", sessionId));
return WebUtils.getJson(url, GetEmaneModels.class);
GetEmaneModels getEmaneModels = WebUtils.getJson(url, GetEmaneModels.class);
return getEmaneModels.getModels();
}
@Override
public GetConfig getEmaneModelConfig(Integer id, String model) throws IOException {
public List<ConfigGroup> getEmaneModelConfig(Integer id, String model) throws IOException {
String url = getUrl(String.format("sessions/%s/emane/model/config", sessionId));
Map<String, String> args = new HashMap<>();
args.put("node", id.toString());
args.put("name", model);
return WebUtils.getJson(url, GetConfig.class, args);
GetConfig getConfig = WebUtils.getJson(url, GetConfig.class, args);
return getConfig.getGroups();
}
@Override
public GetConfig getEmaneConfig(CoreNode node) throws IOException {
public List<ConfigGroup> getEmaneConfig(CoreNode node) throws IOException {
String url = getUrl(String.format("sessions/%s/emane/config", sessionId));
Map<String, String> args = new HashMap<>();
args.put("node", node.getId().toString());
return WebUtils.getJson(url, GetConfig.class, args);
GetConfig getConfig = WebUtils.getJson(url, GetConfig.class, args);
return getConfig.getGroups();
}
@Override
@ -209,21 +221,23 @@ public class CoreRestClient implements ICoreClient {
}
@Override
public CreatedSession openSession(File file) throws IOException {
public SessionOverview openSession(File file) throws IOException {
String url = getUrl("sessions/xml");
return WebUtils.postFile(url, file, CreatedSession.class);
return WebUtils.postFile(url, file, SessionOverview.class);
}
@Override
public GetConfig getSessionConfig() throws IOException {
public List<ConfigGroup> getSessionConfig() throws IOException {
String url = getUrl(String.format("sessions/%s/options", sessionId));
return WebUtils.getJson(url, GetConfig.class);
GetConfig getConfig = WebUtils.getJson(url, GetConfig.class);
return getConfig.getGroups();
}
@Override
public boolean setSessionConfig(SetConfig config) throws IOException {
public boolean setSessionConfig(List<ConfigOption> configOptions) throws IOException {
String url = getUrl(String.format("sessions/%s/options", sessionId));
return WebUtils.putJson(url, config);
SetConfig setConfig = new SetConfig(configOptions);
return WebUtils.putJson(url, setConfig);
}
@Override
@ -275,9 +289,10 @@ public class CoreRestClient implements ICoreClient {
}
@Override
public GetHooks getHooks() throws IOException {
public List<Hook> getHooks() throws IOException {
String url = getUrl(String.format("sessions/%s/hooks", sessionId));
return WebUtils.getJson(url, GetHooks.class);
GetHooks getHooks = WebUtils.getJson(url, GetHooks.class);
return getHooks.getHooks();
}
@Override
@ -311,9 +326,10 @@ public class CoreRestClient implements ICoreClient {
}
@Override
public GetMobilityConfigs getMobilityConfigs() throws IOException {
public Map<Integer, MobilityConfig> getMobilityConfigs() throws IOException {
String url = getUrl(String.format("sessions/%s/mobility/configs", sessionId));
return WebUtils.getJson(url, GetMobilityConfigs.class);
GetMobilityConfigs getMobilityConfigs = WebUtils.getJson(url, GetMobilityConfigs.class);
return getMobilityConfigs.getConfigurations();
}
@Override

10
corefx/src/main/java/com/core/client/rest/CreatedSession.java
View file

@ -1,10 +0,0 @@
package com.core.client.rest;
import lombok.Data;
@Data
public class CreatedSession {
private Integer id;
private Integer state;
private String url;
}

1
corefx/src/main/java/com/core/client/rest/GetConfig.java
View file

@ -1,5 +1,6 @@
package com.core.client.rest;
import com.core.data.ConfigGroup;
import lombok.Data;
import java.util.ArrayList;

16
corefx/src/main/java/com/core/client/rest/GetDefaultServices.java Normal file
View file

@ -0,0 +1,16 @@
package com.core.client.rest;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class GetDefaultServices {
private Map<String, List<String>> defaults = new HashMap<>();
}

3
corefx/src/main/java/com/core/client/rest/GetSessions.java
View file

@ -1,5 +1,6 @@
package com.core.client.rest;
import com.core.data.SessionOverview;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -9,5 +10,5 @@ import java.util.List;
@Data
@NoArgsConstructor
public class GetSessions {
private List<GetSessionsData> sessions = new ArrayList<>();
private List<SessionOverview> sessions = new ArrayList<>();
}

1
corefx/src/main/java/com/core/client/rest/SetConfig.java
View file

@ -1,5 +1,6 @@
package com.core.client.rest;
import com.core.data.ConfigOption;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

1
corefx/src/main/java/com/core/client/rest/SetEmaneConfig.java
View file

@ -1,5 +1,6 @@
package com.core.client.rest;
import com.core.data.ConfigOption;
import lombok.Data;
import java.util.ArrayList;

1
corefx/src/main/java/com/core/client/rest/SetEmaneModelConfig.java
View file

@ -1,5 +1,6 @@
package com.core.client.rest;
import com.core.data.ConfigOption;
import lombok.Data;
import java.util.ArrayList;

2
corefx/src/main/java/com/core/client/rest/ConfigGroup.java → corefx/src/main/java/com/core/data/ConfigGroup.java
View file

@ -1,4 +1,4 @@
package com.core.client.rest;
package com.core.data;
import lombok.Data;

2
corefx/src/main/java/com/core/client/rest/ConfigOption.java → corefx/src/main/java/com/core/data/ConfigOption.java
View file

@ -1,4 +1,4 @@
package com.core.client.rest;
package com.core.data;
import lombok.Data;

6
corefx/src/main/java/com/core/client/rest/GetSession.java → corefx/src/main/java/com/core/data/Session.java
View file

@ -1,7 +1,5 @@
package com.core.client.rest;
package com.core.data;
import com.core.data.CoreNode;
import com.core.data.CoreLink;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -10,7 +8,7 @@ import java.util.List;
@Data
@NoArgsConstructor
public class GetSession {
public class Session {
private Integer state;
private List<CoreNode> nodes = new ArrayList<>();
private List<CoreLink> links = new ArrayList<>();

7
corefx/src/main/java/com/core/client/rest/GetSessionsData.java → corefx/src/main/java/com/core/data/SessionOverview.java
View file

@ -1,12 +1,13 @@
package com.core.client.rest;
package com.core.data;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
public class GetSessionsData {
public class SessionOverview {
private Integer id;
private Integer state;
private Integer nodes;
private Integer nodes = 0;
private String url;
}

13
corefx/src/main/java/com/core/graph/NetworkGraph.java
View file

@ -3,7 +3,6 @@ package com.core.graph;
import com.core.Controller;
import com.core.data.*;
import com.core.ui.Toast;
import com.core.utils.ConfigUtils;
import com.core.utils.IconUtils;
import com.google.common.base.Supplier;
import edu.uci.ics.jung.algorithms.layout.StaticLayout;
@ -72,7 +71,7 @@ public class NetworkGraph {
// node render properties
renderContext.setVertexLabelTransformer(CoreNode::getName);
renderContext.setVertexShapeTransformer(node -> {
double offset = -(IconUtils.ICON_SIZE / 2);
double offset = -(IconUtils.ICON_SIZE / 2.0);
return new Ellipse2D.Double(offset, offset, IconUtils.ICON_SIZE, IconUtils.ICON_SIZE);
});
renderContext.setVertexIconTransformer(vertex -> {
@ -118,7 +117,7 @@ public class NetworkGraph {
if (mouseEvent.getClickCount() == 2 && controller.getCoreClient().isRunning()) {
try {
String shellCommand = controller.getProperties().getProperty(ConfigUtils.SHELL_COMMAND);
String shellCommand = controller.getConfiguration().getShellCommand();
String terminalCommand = controller.getCoreClient().getTerminalCommand(node);
terminalCommand = String.format("%s %s", shellCommand, terminalCommand);
logger.info("launching node terminal: {}", terminalCommand);
@ -348,8 +347,8 @@ public class NetworkGraph {
public void addNode(CoreNode node) {
vertexId = Math.max(node.getId() + 1, node.getId());
Double x = Math.abs(node.getPosition().getX());
Double y = Math.abs(node.getPosition().getY());
double x = Math.abs(node.getPosition().getX());
double y = Math.abs(node.getPosition().getY());
logger.info("adding session node: {}", node);
graph.addVertex(node);
graphLayout.setLocation(node, x, y);
@ -363,8 +362,8 @@ public class NetworkGraph {
node.getPosition().setY(nodeData.getPosition().getY());
// set graph node location
Double x = Math.abs(node.getPosition().getX());
Double y = Math.abs(node.getPosition().getY());
double x = Math.abs(node.getPosition().getX());
double y = Math.abs(node.getPosition().getY());
graphLayout.setLocation(node, x, y);
graphViewer.repaint();
}

2
corefx/src/main/java/com/core/ui/config/BaseConfigItem.java
View file

@ -1,6 +1,6 @@
package com.core.ui.config;
import com.core.client.rest.ConfigOption;
import com.core.data.ConfigOption;
import javafx.scene.control.Label;
import javafx.stage.Stage;
import lombok.Data;

2
corefx/src/main/java/com/core/ui/config/BooleanConfigItem.java
View file

@ -1,6 +1,6 @@
package com.core.ui.config;
import com.core.client.rest.ConfigOption;
import com.core.data.ConfigOption;
import com.jfoenix.controls.JFXToggleButton;
import javafx.scene.Node;
import javafx.stage.Stage;

2
corefx/src/main/java/com/core/ui/config/ConfigItemUtils.java
View file

@ -1,6 +1,6 @@
package com.core.ui.config;
import com.core.client.rest.ConfigOption;
import com.core.data.ConfigOption;
import com.core.data.ConfigDataType;
import javafx.stage.Stage;

2
corefx/src/main/java/com/core/ui/config/DefaultConfigItem.java
View file

@ -1,6 +1,6 @@
package com.core.ui.config;
import com.core.client.rest.ConfigOption;
import com.core.data.ConfigOption;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.Node;
import javafx.stage.Stage;

2
corefx/src/main/java/com/core/ui/config/FileConfigItem.java
View file

@ -1,6 +1,6 @@
package com.core.ui.config;
import com.core.client.rest.ConfigOption;
import com.core.data.ConfigOption;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import javafx.scene.Node;

2
corefx/src/main/java/com/core/ui/config/IConfigItem.java
View file

@ -1,6 +1,6 @@
package com.core.ui.config;
import com.core.client.rest.ConfigOption;
import com.core.data.ConfigOption;
import javafx.scene.Node;
import javafx.scene.control.Label;

2
corefx/src/main/java/com/core/ui/config/SelectConfigItem.java
View file

@ -1,6 +1,6 @@
package com.core.ui.config;
import com.core.client.rest.ConfigOption;
import com.core.data.ConfigOption;
import com.jfoenix.controls.JFXComboBox;
import javafx.scene.Node;
import javafx.stage.Stage;

9
corefx/src/main/java/com/core/ui/dialogs/ConfigDialog.java
View file

@ -1,9 +1,8 @@
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.ConfigGroup;
import com.core.client.rest.ConfigOption;
import com.core.client.rest.GetConfig;
import com.core.data.ConfigGroup;
import com.core.data.ConfigOption;
import com.core.ui.config.ConfigItemUtils;
import com.core.ui.config.IConfigItem;
import com.jfoenix.controls.JFXButton;
@ -38,12 +37,12 @@ public class ConfigDialog extends StageDialog {
return configItems.stream().map(IConfigItem::getOption).collect(Collectors.toList());
}
public void showDialog(String title, GetConfig getConfig, Runnable runnable) {
public void showDialog(String title, List<ConfigGroup> configGroups, Runnable runnable) {
setTitle(title);
configItems.clear();
tabPane.getTabs().clear();
for (ConfigGroup group : getConfig.getGroups()) {
for (ConfigGroup group : configGroups) {
String groupName = group.getName();
Tab tab = new Tab(groupName);
ScrollPane scrollPane = new ScrollPane();

20
corefx/src/main/java/com/core/ui/dialogs/GuiPreferencesDialog.java
View file

@ -3,6 +3,7 @@ package com.core.ui.dialogs;
import com.core.Controller;
import com.core.ui.Toast;
import com.core.utils.ConfigUtils;
import com.core.utils.Configuration;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import javafx.event.ActionEvent;
@ -12,7 +13,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.Properties;
public class GuiPreferencesDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
@ -30,12 +30,12 @@ public class GuiPreferencesDialog extends StageDialog {
}
private EventHandler<ActionEvent> onSave = event -> {
Properties properties = getController().getProperties();
properties.setProperty(ConfigUtils.XML_PATH, xmlFilePathTextField.getText());
properties.setProperty(ConfigUtils.MOBILITY_PATH, mobilityFilePathTextField.getText());
properties.setProperty(ConfigUtils.SHELL_COMMAND, shellCommandTextField.getText());
Configuration configuration = getController().getConfiguration();
configuration.setXmlPath(xmlFilePathTextField.getText());
configuration.setMobilityPath(mobilityFilePathTextField.getText());
configuration.setShellCommand(shellCommandTextField.getText());
try {
ConfigUtils.save(properties);
ConfigUtils.save(configuration);
Toast.success("Updated preferences");
} catch (IOException ex) {
Toast.error("Failure to update preferences", ex);
@ -44,10 +44,10 @@ public class GuiPreferencesDialog extends StageDialog {
};
public void showDialog() {
Properties properties = getController().getProperties();
xmlFilePathTextField.setText(properties.getProperty(ConfigUtils.XML_PATH));
mobilityFilePathTextField.setText(properties.getProperty(ConfigUtils.MOBILITY_PATH));
shellCommandTextField.setText(properties.getProperty(ConfigUtils.SHELL_COMMAND));
Configuration configuration = getController().getConfiguration();
xmlFilePathTextField.setText(configuration.getXmlPath());
mobilityFilePathTextField.setText(configuration.getMobilityPath());
shellCommandTextField.setText(configuration.getShellCommand());
show();
}
}

5
corefx/src/main/java/com/core/ui/dialogs/HooksDialog.java
View file

@ -1,7 +1,6 @@
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetHooks;
import com.core.data.Hook;
import com.core.data.SessionState;
import com.core.ui.Toast;
@ -98,8 +97,8 @@ public class HooksDialog extends StageDialog {
// update hooks
try {
GetHooks getHooks = getCoreClient().getHooks();
for (Hook hook : getHooks.getHooks()) {
List<Hook> hooks = getCoreClient().getHooks();
for (Hook hook : hooks) {
SessionState state = SessionState.get(hook.getState());
hook.setStateDisplay(state.name());
hooksTable.getItems().add(hook);

16
corefx/src/main/java/com/core/ui/dialogs/MobilityDialog.java
View file

@ -4,7 +4,6 @@ import com.core.Controller;
import com.core.data.CoreNode;
import com.core.data.MobilityConfig;
import com.core.ui.Toast;
import com.core.utils.ConfigUtils;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.controls.JFXToggleButton;
@ -73,14 +72,19 @@ public class MobilityDialog extends StageDialog {
FileChooser fileChooser = new FileChooser();
fileChooser.setTitle("Select File");
String mobilityPath = getController().getProperties().getProperty(ConfigUtils.MOBILITY_PATH);
String mobilityPath = getController().getConfiguration().getMobilityPath();
fileChooser.setInitialDirectory(new File(mobilityPath));
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Mobility",
"*.mobility"));
File file = fileChooser.showOpenDialog(getController().getWindow());
if (file != null) {
logger.info("opening session xml: {}", file.getPath());
textField.setText(file.getPath());
try {
File file = fileChooser.showOpenDialog(getController().getWindow());
if (file != null) {
logger.info("opening session xml: {}", file.getPath());
textField.setText(file.getPath());
}
} catch (IllegalArgumentException ex) {
Toast.error(String.format("Invalid mobility directory: %s",
getController().getConfiguration().getMobilityPath()));
}
}

16
corefx/src/main/java/com/core/ui/dialogs/NodeEmaneDialog.java
View file

@ -1,8 +1,8 @@
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.ConfigOption;
import com.core.client.rest.GetConfig;
import com.core.data.ConfigGroup;
import com.core.data.ConfigOption;
import com.core.data.CoreNode;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
@ -50,10 +50,10 @@ public class NodeEmaneDialog extends StageDialog {
private void emaneButtonHandler(ActionEvent event) {
try {
GetConfig getConfig = getCoreClient().getEmaneConfig(coreNode);
logger.debug("emane model config: {}", getConfig);
List<ConfigGroup> configGroups = getCoreClient().getEmaneConfig(coreNode);
logger.debug("emane model config: {}", configGroups);
String title = String.format("%s EMANE Config", coreNode.getName());
getController().getConfigDialog().showDialog(title, getConfig, () -> {
getController().getConfigDialog().showDialog(title, configGroups, () -> {
List<ConfigOption> options = getController().getConfigDialog().getOptions();
try {
getCoreClient().setEmaneConfig(coreNode, options);
@ -73,10 +73,10 @@ public class NodeEmaneDialog extends StageDialog {
public void displayEmaneModelConfig(Integer id, String model) {
try {
GetConfig getConfig = getCoreClient().getEmaneModelConfig(id, model);
logger.debug("emane model config: {}", getConfig);
List<ConfigGroup> configGroups = getCoreClient().getEmaneModelConfig(id, model);
logger.debug("emane model config: {}", configGroups);
String title = String.format("EMANE(%s) %s Config", id, model);
getController().getConfigDialog().showDialog(title, getConfig, () -> {
getController().getConfigDialog().showDialog(title, configGroups, () -> {
List<ConfigOption> options = getController().getConfigDialog().getOptions();
try {
getCoreClient().setEmaneModelConfig(id, model, options);

7
corefx/src/main/java/com/core/ui/dialogs/NodeServicesDialog.java
View file

@ -1,7 +1,6 @@
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetServices;
import com.core.data.CoreNode;
import com.core.ui.ServiceItem;
import com.jfoenix.controls.JFXButton;
@ -81,14 +80,14 @@ public class NodeServicesDialog extends StageDialog {
});
}
public void setServices(GetServices getServices) {
public void setServices(Map<String, List<String>> serviceGroups) {
serviceItemGroups.clear();
getServices.getGroups().keySet().stream()
serviceGroups.keySet().stream()
.sorted()
.forEach(group -> {
groupListView.getItems().add(group);
getServices.getGroups().get(group).stream()
serviceGroups.get(group).stream()
.sorted()
.forEach(service -> {
ServiceItem serviceItem = new ServiceItem(service);

16
corefx/src/main/java/com/core/ui/dialogs/NodeTypesDialog.java
View file

@ -15,13 +15,17 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class NodeTypesDialog extends StageDialog {
private static final Logger logger = LogManager.getLogger();
private final Map<String, NodeType> nodeTypeMap = new HashMap<>();
private NodeType selectedNodeType;
private Map<String, List<String>> defaultServices = new HashMap<>();
@FXML private JFXListView<String> listView;
@FXML private JFXTextField modelTextField;
@FXML private JFXTextField displayTextField;
@ -31,6 +35,7 @@ public class NodeTypesDialog extends StageDialog {
@FXML private JFXButton saveButton;
@FXML private JFXButton addButton;
@FXML private JFXButton deleteButton;
@FXML private JFXListView<String> nodeServicesListView;
public NodeTypesDialog(Controller controller) {
super(controller, "/fxml/node_types_dialog.fxml");
@ -48,6 +53,8 @@ public class NodeTypesDialog extends StageDialog {
iconTextField.setText(nodeType.getIcon());
iconImage.setImage(new Image(nodeType.getIcon()));
selectedNodeType = nodeType;
List<String> services = defaultServices.getOrDefault(nodeType.getModel(), Collections.emptyList());
nodeServicesListView.getItems().setAll(services);
});
iconButton.setOnAction(event -> {
@ -79,6 +86,15 @@ public class NodeTypesDialog extends StageDialog {
});
}
public void updateDefaultServices() {
try {
defaultServices = getCoreClient().defaultServices();
listView.getSelectionModel().selectFirst();
} catch (IOException ex) {
Toast.error("Error getting default services", ex);
}
}
public void showDialog() {
listView.getItems().clear();
nodeTypeMap.clear();

16
corefx/src/main/java/com/core/ui/dialogs/SessionsDialog.java
View file

@ -1,8 +1,7 @@
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetSessions;
import com.core.client.rest.GetSessionsData;
import com.core.data.SessionOverview;
import com.core.data.SessionState;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
@ -15,6 +14,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
public class SessionsDialog extends StageDialog {
@ -55,17 +55,17 @@ public class SessionsDialog extends StageDialog {
private String state;
private Integer nodes;
public SessionRow(GetSessionsData getSessionsData) {
id = getSessionsData.getId();
state = SessionState.get(getSessionsData.getState()).name();
nodes = getSessionsData.getNodes();
public SessionRow(SessionOverview sessionOverview) {
id = sessionOverview.getId();
state = SessionState.get(sessionOverview.getState()).name();
nodes = sessionOverview.getNodes();
}
}
public void showDialog() throws IOException {
sessionsTable.getItems().clear();
GetSessions getSessions = getCoreClient().getSessions();
sessionsTable.getItems().addAll(getSessions.getSessions().stream()
List<SessionOverview> sessions = getCoreClient().getSessions();
sessionsTable.getItems().addAll(sessions.stream()
.map(SessionRow::new)
.collect(Collectors.toList()));

16
corefx/src/main/java/com/core/ui/dialogs/SessionsFoenixDialog.java
View file

@ -1,8 +1,7 @@
package com.core.ui.dialogs;
import com.core.Controller;
import com.core.client.rest.GetSessions;
import com.core.client.rest.GetSessionsData;
import com.core.data.SessionOverview;
import com.core.data.SessionState;
import com.core.ui.Toast;
import com.jfoenix.controls.JFXButton;
@ -15,6 +14,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
public class SessionsFoenixDialog extends CoreFoenixDialog {
@ -52,17 +52,17 @@ public class SessionsFoenixDialog extends CoreFoenixDialog {
private String state;
private Integer nodes;
public SessionRow(GetSessionsData getSessionsData) {
id = getSessionsData.getId();
state = SessionState.get(getSessionsData.getState()).name();
nodes = getSessionsData.getNodes();
public SessionRow(SessionOverview sessionOverview) {
id = sessionOverview.getId();
state = SessionState.get(sessionOverview.getState()).name();
nodes = sessionOverview.getNodes();
}
}
public void showDialog() throws IOException {
sessionsTable.getItems().clear();
GetSessions getSessions = getCoreClient().getSessions();
sessionsTable.getItems().addAll(getSessions.getSessions().stream()
List<SessionOverview> sessions = getCoreClient().getSessions();
sessionsTable.getItems().addAll(sessions.stream()
.map(SessionRow::new)
.collect(Collectors.toList()));
getDialog().show(getController().getStackPane());

53
corefx/src/main/java/com/core/utils/ConfigUtils.java
View file

@ -4,36 +4,38 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
public final class ConfigUtils {
private static final Logger logger = LogManager.getLogger();
private static final String DEFAULT_CONFIG = "/config.properties";
private static final String CONFIG_FILE_NAME = "config.json";
private static final String DEFAULT_CONFIG = "/" + CONFIG_FILE_NAME;
private static final Path HOME = Paths.get(System.getProperty("user.home"), ".core");
private static final Path PROPERTIES_FILE = Paths.get(HOME.toString(), "config.properties");
private static final Path CONFIG_FILE = Paths.get(HOME.toString(), CONFIG_FILE_NAME);
private static final Path XML_DIR = Paths.get(HOME.toString(), "xml");
private static final Path MOBILITY_DIR = Paths.get(HOME.toString(), "mobility");
// config fields
public static final String REST_URL = "core-rest";
public static final String XML_PATH = "xml-path";
public static final String MOBILITY_PATH = "mobility-path";
public static final String SHELL_COMMAND = "shell-command";
private ConfigUtils() {
}
public static void save(Properties properties) throws IOException {
properties.store(new FileOutputStream(PROPERTIES_FILE.toFile()), null);
public static void save(Configuration configuration) throws IOException {
String fileData = JsonUtils.toPrettyString(configuration);
try (PrintWriter out = new PrintWriter(CONFIG_FILE.toFile())) {
out.println(fileData);
}
}
public static Properties load() {
private static Configuration readConfig() throws IOException {
return JsonUtils.read(new FileInputStream(CONFIG_FILE.toFile()), Configuration.class);
}
public static Configuration load() {
try {
if (!HOME.toFile().exists()) {
logger.info("creating core home directory");
@ -42,28 +44,19 @@ public final class ConfigUtils {
Files.createDirectory(MOBILITY_DIR);
}
Properties properties = new Properties();
if (!PROPERTIES_FILE.toFile().exists()) {
Configuration configuration;
if (!CONFIG_FILE.toFile().exists()) {
logger.info("creating default configuration");
Files.copy(ConfigUtils.class.getResourceAsStream(DEFAULT_CONFIG), PROPERTIES_FILE);
properties.load(new FileInputStream(PROPERTIES_FILE.toFile()));
properties.setProperty(XML_PATH, XML_DIR.toString());
properties.setProperty(MOBILITY_PATH, MOBILITY_DIR.toString());
save(properties);
Files.copy(ConfigUtils.class.getResourceAsStream(DEFAULT_CONFIG), CONFIG_FILE);
configuration = readConfig();
configuration.setXmlPath(XML_DIR.toString());
configuration.setMobilityPath(MOBILITY_DIR.toString());
save(configuration);
} else {
properties.load(new FileInputStream(PROPERTIES_FILE.toFile()));
configuration = readConfig();
}
// override values if provided
for (String key : properties.stringPropertyNames()) {
String value = System.getProperty(key);
if (value != null) {
logger.info("command line config: {} - {}", key, value);
properties.setProperty(key, value);
}
}
return properties;
return configuration;
} catch (IOException ex) {
logger.error("error reading config file");
throw new RuntimeException("configuration file did not exist");

17
corefx/src/main/java/com/core/utils/Configuration.java Normal file
View file

@ -0,0 +1,17 @@
package com.core.utils;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
@Data
@NoArgsConstructor
public class Configuration {
private String coreRest;
private String xmlPath;
private String mobilityPath;
private String shellCommand;
private List<NodeTypeConfig> nodeTypeConfigs = new ArrayList<>();
}

4
corefx/src/main/java/com/core/utils/JsonUtils.java
View file

@ -39,6 +39,10 @@ public final class JsonUtils {
}
}
public static String toPrettyString(Object obj) throws JsonProcessingException {
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(obj);
}
public static String toString(Object obj) throws JsonProcessingException {
return mapper.writeValueAsString(obj);
}

16
corefx/src/main/java/com/core/utils/NodeTypeConfig.java Normal file
View file

@ -0,0 +1,16 @@
package com.core.utils;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
@Data
@NoArgsConstructor
public class NodeTypeConfig {
private String model;
private String display;
private String icon;
private List<String> services = new ArrayList<>();
}

6
corefx/src/main/resources/config.json Normal file
View file

@ -0,0 +1,6 @@
{
"coreRest": "http://127.0.0.1:5000",
"xmlPath": null,
"mobilityPath": null,
"shellCommand": "gnome-terminal --window --"
}

2
corefx/src/main/resources/config.properties
View file

@ -1,2 +0,0 @@
core-rest=http://127.0.0.1:5000
shell-command=gnome-terminal --window --

24
corefx/src/main/resources/fxml/main.fxml
View file

@ -18,17 +18,20 @@
<children>
<MenuBar>
<menus>
<Menu mnemonicParsing="false" text="Main">
<Menu mnemonicParsing="false" text="Menu">
<items>
<MenuItem mnemonicParsing="false" onAction="#onCoreMenuConnect" text="Connection" />
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem fx:id="saveXmlMenuItem" disable="true" mnemonicParsing="false" onAction="#onSaveXmlAction" text="Save XML" />
<MenuItem mnemonicParsing="false" onAction="#onOpenXmlAction" text="Open XML" />
</items>
</Menu>
<MenuItem mnemonicParsing="false" onAction="#onOptionsMenuNodeTypes" text="Nodes" />
<MenuItem mnemonicParsing="false" onAction="#onOptionsMenuBackground" text="Background" />
<MenuItem mnemonicParsing="false" onAction="#onOptionsMenuPreferences" text="Preferences" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="File">
<items>
<MenuItem fx:id="saveXmlMenuItem" disable="true" mnemonicParsing="false" onAction="#onSaveXmlAction" text="Save XML" />
<MenuItem mnemonicParsing="false" onAction="#onOpenXmlAction" text="Open XML" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Session">
<items>
<MenuItem mnemonicParsing="false" onAction="#onJoinSessionMenu" text="Join" />
@ -36,13 +39,6 @@
<MenuItem mnemonicParsing="false" onAction="#onOptionsMenuLocation" text="Location" />
<MenuItem mnemonicParsing="false" onAction="#onSessionOptionsMenu" text="Options" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Options">
<items>
<MenuItem mnemonicParsing="false" onAction="#onOptionsMenuNodeTypes" text="Nodes" />
<MenuItem mnemonicParsing="false" onAction="#onOptionsMenuBackground" text="Background" />
<MenuItem mnemonicParsing="false" onAction="#onOptionsMenuPreferences" text="Preferences" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Help">
<items>

4
corefx/src/main/resources/fxml/node_types_dialog.fxml
View file

@ -11,7 +11,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<GridPane hgap="10.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" vgap="10.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8.0.171">
<GridPane hgap="10.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" vgap="10.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" percentWidth="33.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@ -66,6 +66,8 @@
<JFXButton fx:id="iconButton" maxWidth="1.7976931348623157E308" styleClass="core-button" text="Find" GridPane.columnIndex="1" />
</children>
</GridPane>
<Label text="Services" />
<JFXListView fx:id="nodeServicesListView" VBox.vgrow="ALWAYS" />
</children>
<GridPane.margin>
<Insets />