You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2018/04/19 18:58:40 UTC
[GitHub] rhtyd closed pull request #2587: Remote empty VPN test class
rhtyd closed pull request #2587: Remote empty VPN test class
URL: https://github.com/apache/cloudstack/pull/2587
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/server/pom.xml b/server/pom.xml
index 41668ec4f75..cd99780dbc7 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -183,7 +183,6 @@
<exclude>com/cloud/storage/dao/*</exclude>
<exclude>com/cloud/vm/dao/*</exclude>
<exclude>com/cloud/api/ListPerfTest.java</exclude>
- <exclude>com/cloud/network/vpn/RemoteAccessVpnTest.java</exclude>
<exclude>com/cloud/network/security/SecurityGroupManagerImpl2Test.java</exclude>
<exclude>com/cloud/network/security/SecurityGroupManagerImpl2Test.java</exclude>
<exclude>com/cloud/vpc/VpcTestConfiguration.java</exclude>
diff --git a/server/src/test/java/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java b/server/src/test/java/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java
deleted file mode 100644
index 0156afb58df..00000000000
--- a/server/src/test/java/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.network.vpn;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.naming.ConfigurationException;
-
-import com.cloud.exception.ResourceUnavailableException;
-import com.cloud.network.RemoteAccessVpn;
-import com.cloud.network.VpnUser;
-import com.cloud.network.element.RemoteAccessVPNServiceProvider;
-import com.cloud.utils.component.ManagerBase;
-
-public class MockRemoteAccessVPNServiceProvider extends ManagerBase implements RemoteAccessVPNServiceProvider {
-
- @Override
- public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
- return true;
- }
-
- @Override
- public String getName() {
- return "MockRemoteAccessVPNServiceProvider";
- }
-
- @Override
- public boolean start() {
- return true;
- }
-
- @Override
- public boolean stop() {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public String[] applyVpnUsers(RemoteAccessVpn vpn, List<? extends VpnUser> users) throws ResourceUnavailableException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public boolean startVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public boolean stopVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException {
- // TODO Auto-generated method stub
- return false;
- }
-
-}
diff --git a/server/src/test/java/com/cloud/network/vpn/RemoteAccessVpnTest.java b/server/src/test/java/com/cloud/network/vpn/RemoteAccessVpnTest.java
deleted file mode 100644
index 58315e60f57..00000000000
--- a/server/src/test/java/com/cloud/network/vpn/RemoteAccessVpnTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package com.cloud.network.vpn;
-
-import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Test;
-
-public class RemoteAccessVpnTest {
- private final static Logger s_logger = Logger.getLogger(RemoteAccessVpnTest.class);
-
-// private static void addDaos(MockComponentLocator locator) {
-// locator.addDao("AccountDao", AccountDaoImpl.class);
-// locator.addDao("VpnUserDao", VpnUserDaoImpl.class);
-// locator.addDao("FirewallRulesDao", FirewallRulesDaoImpl.class);
-// locator.addDao("IPAddressDao", IPAddressDaoImpl.class);
-// locator.addDao("DomainDao", DomainDaoImpl.class);
-// locator.addDao("UsageEventDao", UsageEventDaoImpl.class);
-// locator.addDao("RemoteAccessVpnDao", RemoteAccessVpnDaoImpl.class);
-// locator.addDao("ConfigurationDao", ConfigurationDaoImpl.class);
-//
-// }
-//
-// private static void addManagers(MockComponentLocator locator) {
-// locator.addManager("AccountManager", MockAccountManagerImpl.class);
-// locator.addManager("DomainManager", MockDomainManagerImpl.class);
-// locator.addManager("NetworkManager", MockNetworkManagerImpl.class);
-// locator.addManager("NetworkModel", MockNetworkModelImpl.class);
-// locator.addManager("RulesManager", MockRulesManagerImpl.class);
-// locator.addManager("FirewallManager", MockFirewallManagerImpl.class);
-// }
-
-// @Before
-// public void setUp() {
-// locator = new MockComponentLocator("management-server");
-// addDaos(locator);
-// addManagers(locator);
-// s_logger.info("Finished setUp");
-// }
-
- @After
- public void tearDown() throws Exception {
- }
-
- @Test
- public void testInjected() throws Exception {
-// List<Pair<String, Class<? extends RemoteAccessVPNServiceProvider>>> list =
-// new ArrayList<Pair<String, Class<? extends RemoteAccessVPNServiceProvider>>>();
-// list.add(new Pair<String, Class<? extends RemoteAccessVPNServiceProvider>>("RemoteAccessVPNServiceProvider", MockRemoteAccessVPNServiceProvider.class));
-// locator.addAdapterChain(RemoteAccessVPNServiceProvider.class, list);
-// s_logger.info("Finished add adapter");
-// locator.makeActive(new DefaultInterceptorLibrary());
-// s_logger.info("Finished make active");
-// RemoteAccessVpnManagerImpl vpnMgr = ComponentLocator.inject(RemoteAccessVpnManagerImpl.class);
-// s_logger.info("Finished inject");
-// Assert.assertTrue(vpnMgr.configure("RemoteAccessVpnMgr",new HashMap<String, Object>()) );
-// Assert.assertTrue(vpnMgr.start());
-// int numProviders = vpnMgr.getRemoteAccessVPNServiceProviders().size();
-// Assert.assertTrue(numProviders > 0);
- }
-
-}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services