-
Notifications
You must be signed in to change notification settings - Fork 314
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(web2): Updated web2 for the new network service #4353
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
240 changes: 240 additions & 0 deletions
240
...ipse.kura.web2/src/main/java/org/eclipse/kura/web/server/GwtNetworkServiceImplFacade.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,240 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2023 Eurotech and/or its affiliates and others | ||
| * | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Eurotech | ||
| *******************************************************************************/ | ||
| package org.eclipse.kura.web.server; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import org.eclipse.kura.net.NetworkAdminService; | ||
| import org.eclipse.kura.web.server.util.ServiceLocator; | ||
| import org.eclipse.kura.web.shared.GwtKuraException; | ||
| import org.eclipse.kura.web.shared.model.GwtFirewallNatEntry; | ||
| import org.eclipse.kura.web.shared.model.GwtFirewallOpenPortEntry; | ||
| import org.eclipse.kura.web.shared.model.GwtFirewallPortForwardEntry; | ||
| import org.eclipse.kura.web.shared.model.GwtModemPdpEntry; | ||
| import org.eclipse.kura.web.shared.model.GwtNetInterfaceConfig; | ||
| import org.eclipse.kura.web.shared.model.GwtWifiChannelFrequency; | ||
| import org.eclipse.kura.web.shared.model.GwtWifiConfig; | ||
| import org.eclipse.kura.web.shared.model.GwtWifiHotspotEntry; | ||
| import org.eclipse.kura.web.shared.model.GwtWifiRadioMode; | ||
| import org.eclipse.kura.web.shared.model.GwtXSRFToken; | ||
| import org.eclipse.kura.web.shared.service.GwtNetworkService; | ||
|
|
||
| public class GwtNetworkServiceImplFacade extends OsgiRemoteServiceServlet implements GwtNetworkService { | ||
|
|
||
| private static final long serialVersionUID = -4188750359099902616L; | ||
|
|
||
| private static Optional<Boolean> isNet2 = Optional.empty(); | ||
|
|
||
| @Override | ||
| public List<GwtNetInterfaceConfig> findNetInterfaceConfigurations(boolean recompute) | ||
| throws GwtKuraException { | ||
|
|
||
| if (isNet2()) { | ||
| return org.eclipse.kura.web.server.net2.GwtNetworkServiceImpl.findNetInterfaceConfigurations(recompute); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.findNetInterfaceConfigurations(recompute); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void updateNetInterfaceConfigurations(GwtXSRFToken xsrfToken, GwtNetInterfaceConfig config) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| org.eclipse.kura.web.server.net2.GwtNetworkServiceImpl.updateNetInterfaceConfigurations(config); | ||
| } else { | ||
| org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.updateNetInterfaceConfigurations(config); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public ArrayList<GwtFirewallOpenPortEntry> findDeviceFirewallOpenPorts(GwtXSRFToken xsrfToken) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| return (ArrayList<GwtFirewallOpenPortEntry>) org.eclipse.kura.web.server.net2.GwtNetworkServiceImpl | ||
| .findDeviceFirewallOpenPorts(); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.findDeviceFirewallOpenPorts(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public ArrayList<GwtWifiHotspotEntry> findWifiHotspots(GwtXSRFToken xsrfToken, String interfaceName, | ||
| String wirelessSsid) throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| return new ArrayList<>(); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.findWifiHotspots(interfaceName, wirelessSsid); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<GwtModemPdpEntry> findPdpContextInfo(GwtXSRFToken xsrfToken, String interfaceName) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| return new ArrayList<>(); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.findPdpContextInfo(interfaceName); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean verifyWifiCredentials(GwtXSRFToken xsrfToken, String interfaceName, GwtWifiConfig gwtWifiConfig) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| return false; | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.verifyWifiCredentials(interfaceName, | ||
| gwtWifiConfig); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public ArrayList<GwtFirewallPortForwardEntry> findDeviceFirewallPortForwards(GwtXSRFToken xsrfToken) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| return (ArrayList<GwtFirewallPortForwardEntry>) org.eclipse.kura.web.server.net2.GwtNetworkServiceImpl | ||
| .findDeviceFirewallPortForwards(); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.findDeviceFirewallPortForwards(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public ArrayList<GwtFirewallNatEntry> findDeviceFirewallNATs(GwtXSRFToken xsrfToken) throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| return (ArrayList<GwtFirewallNatEntry>) org.eclipse.kura.web.server.net2.GwtNetworkServiceImpl | ||
| .findDeviceFirewallNATs(); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.findDeviceFirewallNATs(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void updateDeviceFirewallOpenPorts(GwtXSRFToken xsrfToken, List<GwtFirewallOpenPortEntry> entries) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.updateDeviceFirewallOpenPorts(entries); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateDeviceFirewallPortForwards(GwtXSRFToken xsrfToken, List<GwtFirewallPortForwardEntry> entries) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.updateDeviceFirewallPortForwards(entries); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateDeviceFirewallNATs(GwtXSRFToken xsrfToken, List<GwtFirewallNatEntry> entries) | ||
| throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.updateDeviceFirewallNATs(entries); | ||
| } | ||
|
|
||
| @Override | ||
| public void renewDhcpLease(GwtXSRFToken xsrfToken, String interfaceName) throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| } else { | ||
| org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.renewDhcpLease(interfaceName); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<GwtWifiChannelFrequency> findFrequencies(GwtXSRFToken xsrfToken, String interfaceName, | ||
| GwtWifiRadioMode radioMode) throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| return new ArrayList<>(); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.findFrequencies(interfaceName, radioMode); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getWifiCountryCode(GwtXSRFToken xsrfToken) throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| return ""; | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.getWifiCountryCode(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isIEEE80211ACSupported(GwtXSRFToken xsrfToken, String ifaceName) throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| return false; | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.isIEEE80211ACSupported(ifaceName); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> getDhcpLeases(GwtXSRFToken xsrfToken) throws GwtKuraException { | ||
| checkXSRFToken(xsrfToken); | ||
|
|
||
| if (isNet2()) { | ||
| // TODO | ||
| return new ArrayList<>(); | ||
| } else { | ||
| return org.eclipse.kura.web.server.net.GwtNetworkServiceImpl.getDhcpLeases(); | ||
| } | ||
| } | ||
|
|
||
| private static boolean isNet2() { | ||
| if (isNet2.isPresent()) { | ||
| return isNet2.get(); | ||
| } | ||
|
|
||
| try { | ||
| ServiceLocator.getInstance().getService(NetworkAdminService.class); | ||
| isNet2 = Optional.of(false); | ||
| return false; | ||
| } catch (GwtKuraException networkAdminServiceNotFound) { | ||
| isNet2 = Optional.of(true); | ||
| return true; | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please update copyright header