http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/pom.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/pom.xml b/products/python-cartridge-agent/integration/pom.xml index a359615..52cc286 100755 --- a/products/python-cartridge-agent/integration/pom.xml +++ b/products/python-cartridge-agent/integration/pom.xml @@ -72,8 +72,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*</exclude> + </excludes> + </configuration> <executions> - <execution> + <!--execution> <id>default-test</id> <goals> <goal>test</goal> @@ -98,6 +103,19 @@ </suiteXmlFiles> <workingDirectory>${basedir}/target</workingDirectory> </configuration> + </execution--> + <execution> + <id>adc-mt-test</id> + <goals> + <goal>test</goal> + </goals> + <inherited>false</inherited> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>src/test/resources/pca-testing3.xml</suiteXmlFile> + </suiteXmlFiles> + <workingDirectory>${basedir}/target</workingDirectory> + </configuration> </execution> </executions> </plugin>
http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCMTAppTest.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCMTAppTest.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCMTAppTest.java new file mode 100644 index 0000000..3104281 --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCMTAppTest.java @@ -0,0 +1,213 @@ +package org.apache.stratos.python.cartridge.agent.test;/* + * 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. + */ + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.domain.LoadBalancingIPType; +import org.apache.stratos.messaging.domain.topology.*; +import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent; +import org.apache.stratos.messaging.event.topology.CompleteTopologyEvent; +import org.apache.stratos.messaging.event.topology.MemberInitializedEvent; +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Test; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import static junit.framework.Assert.assertTrue; + +public class ADCMTAppTest extends PythonAgentTestManager { + private static final Log log = LogFactory.getLog(ADCMTAppTest.class); + private static final int ADC_TIMEOUT = 180000; + private static final String RESOURCES_PATH = "/suite-3"; + private static final String APPLICATION_PATH = "/tmp/pca-test-suite-3"; + private static final String CLUSTER_ID = "tomcat.domain"; + private static final String DEPLOYMENT_POLICY_NAME = "deployment-policy-3"; + private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-3"; + private static final String APP_ID = "application-3"; + private static final String MEMBER_ID = "tomcat.member-1"; + private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; + private static final String NETWORK_PARTITION_ID = "network-partition-1"; + private static final String PARTITION_ID = "partition-1"; + private static final String TENANT_ID = "-1234"; + private static final String SERVICE_NAME = "tomcat-mt"; + + private static boolean hasADCTestCompleted = false; + + @BeforeSuite + public void setupADCMTAppTest() { + // Set jndi.properties.dir system property for initializing event publishers and receivers + System.setProperty("jndi.properties.dir", getResourcesPath(RESOURCES_PATH)); + + // start Python agent with configurations provided in resource path + setup(RESOURCES_PATH); + + // Simulate server socket + startServerSocket(8080); + } + + /** + * TearDown method for test method testPythonCartridgeAgent + */ + @AfterSuite + public void tearDownADCMTAppTest() { + // TODO: app path is duplicated in Java test and payload + tearDown(APPLICATION_PATH); + } + + @Test(timeOut = ADC_TIMEOUT) + public void testADCForMTApps() { + startCommunicatorThread(); + assertAgentActivation(); + Thread adcTestThread = new Thread(new Runnable() { + @Override + public void run() { + log.info("Running ADC MT Test thread..."); + // Send artifact updated event + publishEvent(getArtifactUpdatedEventForPublicRepo()); + log.info("Publishing artifact updated event for repo: " + + getArtifactUpdatedEventForPublicRepo().getRepoURL()); + + List<String> outputLines = new ArrayList<String>(); + while (!outputStream.isClosed() && !hasADCTestCompleted) { + List<String> newLines = getNewLines(outputLines, outputStream.toString()); + if (newLines.size() > 0) { + for (String line : newLines) { + if (line.contains("Git clone executed")) { + log.info("Agent has completed git clone. Asserting the operation..."); + assertRepoClone(getArtifactUpdatedEventForPublicRepo()); + //hasADCTestCompleted = true; + } + } + } + sleep(1000); + } + } + }); + adcTestThread.start(); + + while (!hasADCTestCompleted) { + // wait until the instance activated event is received. + sleep(1000); + } + } + + private void assertAgentActivation() { + Thread startupTestThread = new Thread(new Runnable() { + @Override + public void run() { + while (!eventReceiverInitiated) { + sleep(1000); + } + List<String> outputLines = new ArrayList<String>(); + while (!outputStream.isClosed()) { + List<String> newLines = getNewLines(outputLines, outputStream.toString()); + if (newLines.size() > 0) { + for (String line : newLines) { + if (line.contains("Subscribed to 'topology/#'")) { + sleep(2000); + // Send complete topology event + log.info("Publishing complete topology event..."); + Topology topology = createTestTopology(); + CompleteTopologyEvent completeTopologyEvent = new CompleteTopologyEvent(topology); + publishEvent(completeTopologyEvent); + log.info("Complete topology event published"); + + // Publish member initialized event + log.info("Publishing member initialized event..."); + MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent( + SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, + PARTITION_ID + ); + publishEvent(memberInitializedEvent); + log.info("Member initialized event published"); + } + + // Send artifact updated event to activate the instance first + if (line.contains("Artifact repository found")) { + publishEvent(getArtifactUpdatedEventForPublicRepo()); + log.info("Artifact updated event published"); + } + log.info(line); + } + } + sleep(1000); + } + } + }); + startupTestThread.start(); + + while (!instanceStarted || !instanceActivated) { + // wait until the instance activated event is received. + // this will assert whether instance got activated within timeout period; no need for explicit assertions + sleep(2000); + } + } + + private ArtifactUpdatedEvent getArtifactUpdatedEventForPublicRepo() { + ArtifactUpdatedEvent publicRepoEvent = createTestArtifactUpdatedEvent(); + publicRepoEvent.setRepoURL("https://bitbucket.org/testapache2211/opentestrepo1.git";); + return publicRepoEvent; + } + + private void assertRepoClone(ArtifactUpdatedEvent artifactUpdatedEvent) { + File file = new File(APPLICATION_PATH + "/repository/deployment/server/test1.txt"); + assertTrue("Git clone failed for repo [url] " + artifactUpdatedEvent.getRepoURL(), + file.exists()); + } + + private static ArtifactUpdatedEvent createTestArtifactUpdatedEvent() { + ArtifactUpdatedEvent artifactUpdatedEvent = new ArtifactUpdatedEvent(); + artifactUpdatedEvent.setClusterId(CLUSTER_ID); + artifactUpdatedEvent.setTenantId(TENANT_ID); + return artifactUpdatedEvent; + } + + /** + * Create test topology + * + * @return + */ + private Topology createTestTopology() { + Topology topology = new Topology(); + Service service = new Service(SERVICE_NAME, ServiceType.SingleTenant); + topology.addService(service); + + Cluster cluster = new Cluster(service.getServiceName(), CLUSTER_ID, DEPLOYMENT_POLICY_NAME, + AUTOSCALING_POLICY_NAME, APP_ID); + service.addCluster(cluster); + + Member member = new Member(service.getServiceName(), cluster.getClusterId(), MEMBER_ID, + CLUSTER_INSTANCE_ID, NETWORK_PARTITION_ID, PARTITION_ID, LoadBalancingIPType.Private, + System.currentTimeMillis()); + + member.setDefaultPrivateIP("10.0.0.1"); + member.setDefaultPublicIP("20.0.0.1"); + Properties properties = new Properties(); + properties.setProperty("prop1", "value1"); + member.setProperties(properties); + member.setStatus(MemberStatus.Created); + cluster.addMember(member); + + return topology; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCTest.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCTest.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCTest.java index e657ecc..99dc217 100755 --- a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCTest.java +++ b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/ADCTest.java @@ -37,7 +37,7 @@ import java.util.UUID; import static junit.framework.Assert.assertTrue; -public class ADCTest extends PythonTestManager { +public class ADCTest extends PythonAgentTestManager { private static final Log log = LogFactory.getLog(ADCTest.class); private static final int ADC_TIMEOUT = 180000; private static final String RESOURCES_PATH = "/suite-2"; @@ -52,12 +52,11 @@ public class ADCTest extends PythonTestManager { private static final String PARTITION_ID = "partition-1"; private static final String TENANT_ID = "-1234"; private static final String SERVICE_NAME = "tomcat"; - private static final String SOURCE_PATH = "/tmp/stratos-pca-adc-test-app-path/"; private static boolean hasADCTestCompleted = false; @BeforeSuite - public void setupStartUpTest() { + public void setupADCTest() { // Set jndi.properties.dir system property for initializing event publishers and receivers System.setProperty("jndi.properties.dir", getResourcesPath(RESOURCES_PATH)); @@ -72,33 +71,72 @@ public class ADCTest extends PythonTestManager { * TearDown method for test method testPythonCartridgeAgent */ @AfterSuite - public void tearDownStartUpTest() { + public void tearDownADCTest() { // TODO: app path is duplicated in Java test and payload tearDown(APPLICATION_PATH); } @Test(timeOut = ADC_TIMEOUT) - public void testPythonCartridgeAgent() { - Thread communicatorThread = new Thread(new Runnable() { + public void testADC() { + startCommunicatorThread(); + assertAgentActivation(); + Thread adcTestThread = new Thread(new Runnable() { @Override public void run() { - while (!eventReceiverInitiated) { - sleep(1000); - } + log.info("Running ADC Test thread..."); + // Send artifact updated event + publishEvent(getArtifactUpdatedEventForPrivateRepo()); + log.info("Publishing artifact updated event for repo: " + + getArtifactUpdatedEventForPrivateRepo().getRepoURL()); + List<String> outputLines = new ArrayList<String>(); - while (!outputStream.isClosed()) { + while (!outputStream.isClosed() && !hasADCTestCompleted) { List<String> newLines = getNewLines(outputLines, outputStream.toString()); if (newLines.size() > 0) { for (String line : newLines) { - if (line.contains("Exception in thread") || line.contains("ERROR")) { + if (line.contains("Git clone executed")) { + log.info("Agent has completed git clone. Asserting the operation..."); + assertRepoClone(getArtifactUpdatedEventForPrivateRepo()); + File file = new File(APPLICATION_PATH + "/pca-live-" + UUID.randomUUID()); try { - throw new RuntimeException(line); + file.createNewFile(); } - catch (Exception e) { - log.error("ERROR found in PCA log", e); + catch (IOException e) { + log.error("Could not create file", e); } } + if (line.contains("Pushed artifacts for tenant")) { + // TODO: Get rid of static var + log.info("ADC Test completed"); + hasADCTestCompleted = true; + } + } + } + sleep(1000); + } + } + }); + adcTestThread.start(); + + while (!hasADCTestCompleted) { + // wait until the instance activated event is received. + sleep(1000); + } + } + + private void assertAgentActivation() { + Thread startupTestThread = new Thread(new Runnable() { + @Override + public void run() { + while (!eventReceiverInitiated) { + sleep(1000); + } + List<String> outputLines = new ArrayList<String>(); + while (!outputStream.isClosed()) { + List<String> newLines = getNewLines(outputLines, outputStream.toString()); + if (newLines.size() > 0) { + for (String line : newLines) { if (line.contains("Subscribed to 'topology/#'")) { sleep(2000); // Send complete topology event @@ -126,62 +164,17 @@ public class ADCTest extends PythonTestManager { log.info(line); } } - sleep(100); - } - } - }); - communicatorThread.start(); - - while (!instanceActivated) { - // wait until the instance activated event is received. - sleep(1000); - } - assertTrue("Instance started event was not received", instanceStarted); - assertTrue("Instance activated event was not received", instanceActivated); - - Thread adcTestThread = new Thread(new Runnable() { - @Override - public void run() { - log.info("Running ADC Test thread..."); - // Send artifact updated event - publishEvent(getArtifactUpdatedEventForPrivateRepo()); - log.info("Publishing artifact updated event for repo: " + - getArtifactUpdatedEventForPrivateRepo().getRepoURL()); - - List<String> outputLines = new ArrayList<String>(); - while (!outputStream.isClosed() && !hasADCTestCompleted) { - List<String> newLines = getNewLines(outputLines, outputStream.toString()); - if (newLines.size() > 0) { - for (String line : newLines) { - if (line.contains("Git clone executed")) { - log.info("Agent has completed git clone. Asserting the operation..."); - assertRepoClone(getArtifactUpdatedEventForPrivateRepo()); - File file = new File(APPLICATION_PATH + "/pca-live-" + UUID.randomUUID()); - try { - file.createNewFile(); - } - catch (IOException e) { - log.error("Could not create file", e); - } - } - if (line.contains("Pushed artifacts for tenant")) { - // TODO: Get rid of static var - log.info("ADC Test completed"); - hasADCTestCompleted = true; - } - } - } - sleep(100); + sleep(1000); } } }); - adcTestThread.start(); + startupTestThread.start(); - while (!hasADCTestCompleted) { + while (!instanceStarted || !instanceActivated) { // wait until the instance activated event is received. - sleep(1000); + // this will assert whether instance got activated within timeout period; no need for explicit assertions + sleep(2000); } - assertTrue("ADC Test failed", hasADCTestCompleted); } private void assertRepoClone(ArtifactUpdatedEvent artifactUpdatedEvent) { @@ -190,18 +183,7 @@ public class ADCTest extends PythonTestManager { file.exists()); } - private void assertRepoPush(ArtifactUpdatedEvent artifactUpdatedEvent) { - File file = new File(APPLICATION_PATH + "/test1.txt"); - assertTrue("Git clone failed for repo [url] " + artifactUpdatedEvent.getRepoURL(), file.exists()); - - } - /** - * This method returns a collection of {@link org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent} - * objects as parameters to the test - * - * @return - */ public static ArtifactUpdatedEvent getArtifactUpdatedEventForPublicRepo() { ArtifactUpdatedEvent publicRepoEvent = createTestArtifactUpdatedEvent(); publicRepoEvent.setRepoURL("https://bitbucket.org/testapache2211/opentestrepo1.git";); @@ -216,12 +198,6 @@ public class ADCTest extends PythonTestManager { return privateRepoEvent; } - /** - * Creates an {@link org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent} object with a public - * repository URL - * - * @return - */ private static ArtifactUpdatedEvent createTestArtifactUpdatedEvent() { ArtifactUpdatedEvent artifactUpdatedEvent = new ArtifactUpdatedEvent(); artifactUpdatedEvent.setClusterId(CLUSTER_ID); http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/AgentStartupTest.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/AgentStartupTest.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/AgentStartupTest.java new file mode 100755 index 0000000..83fc227 --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/AgentStartupTest.java @@ -0,0 +1,149 @@ +/* + * 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 org.apache.stratos.python.cartridge.agent.test; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.domain.LoadBalancingIPType; +import org.apache.stratos.messaging.domain.topology.*; +import org.apache.stratos.messaging.event.topology.CompleteTopologyEvent; +import org.apache.stratos.messaging.event.topology.MemberInitializedEvent; +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +public class AgentStartupTest extends PythonAgentTestManager { + private static final Log log = LogFactory.getLog(AgentStartupTest.class); + private static final int STARTUP_TIMEOUT = 30000; + private static final String RESOURCES_PATH = "/suite-1"; + private static final String CLUSTER_ID = "php.php.domain"; + private static final String DEPLOYMENT_POLICY_NAME = "deployment-policy-1"; + private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-1"; + private static final String APP_ID = "application-1"; + private static final String MEMBER_ID = "php.member-1"; + private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; + private static final String NETWORK_PARTITION_ID = "network-partition-1"; + private static final String PARTITION_ID = "partition-1"; + private static final String TENANT_ID = "-1234"; + private static final String SERVICE_NAME = "php"; + + @BeforeSuite + public void setupAgentStartupTest() { + // Set jndi.properties.dir system property for initializing event publishers and receivers + System.setProperty("jndi.properties.dir", getResourcesPath(RESOURCES_PATH)); + + // start Python agent with configurations provided in resource path + setup(RESOURCES_PATH); + + // Simulate server socket + startServerSocket(8080); + } + + + /** + * TearDown method for test method testPythonCartridgeAgent + */ + @AfterSuite + public void tearDownAgentStartupTest() { + tearDown(); + } + + @Test(timeOut = STARTUP_TIMEOUT) + public void testPythonCartridgeAgent() { + startCommunicatorThread(); + Thread startupTestThread = new Thread(new Runnable() { + @Override + public void run() { + while (!eventReceiverInitiated) { + sleep(2000); + } + List<String> outputLines = new ArrayList<String>(); + while (!outputStream.isClosed()) { + List<String> newLines = getNewLines(outputLines, outputStream.toString()); + if (newLines.size() > 0) { + for (String line : newLines) { + if (line.contains("Subscribed to 'topology/#'")) { + sleep(2000); + // Send complete topology event + log.info("Publishing complete topology event..."); + Topology topology = createTestTopology(); + CompleteTopologyEvent completeTopologyEvent = new CompleteTopologyEvent(topology); + publishEvent(completeTopologyEvent); + log.info("Complete topology event published"); + + // Publish member initialized event + log.info("Publishing member initialized event..."); + MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent( + SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, + PARTITION_ID + ); + publishEvent(memberInitializedEvent); + log.info("Member initialized event published"); + } + } + } + sleep(1000); + } + } + }); + + startupTestThread.start(); + + while (!instanceStarted || !instanceActivated) { + // wait until the instance activated event is received. + // this will assert whether instance got activated within timeout period; no need for explicit assertions + sleep(2000); + } + } + + + /** + * Create test topology + * + * @return + */ + private Topology createTestTopology() { + Topology topology = new Topology(); + Service service = new Service(SERVICE_NAME, ServiceType.SingleTenant); + topology.addService(service); + + Cluster cluster = new Cluster(service.getServiceName(), CLUSTER_ID, DEPLOYMENT_POLICY_NAME, + AUTOSCALING_POLICY_NAME, APP_ID); + service.addCluster(cluster); + + Member member = new Member(service.getServiceName(), cluster.getClusterId(), MEMBER_ID, + CLUSTER_INSTANCE_ID, NETWORK_PARTITION_ID, PARTITION_ID, LoadBalancingIPType.Private, + System.currentTimeMillis()); + + member.setDefaultPrivateIP("10.0.0.1"); + member.setDefaultPublicIP("20.0.0.1"); + Properties properties = new Properties(); + properties.setProperty("prop1", "value1"); + member.setProperties(properties); + member.setStatus(MemberStatus.Created); + cluster.addMember(member); + + return topology; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java new file mode 100644 index 0000000..6ed4bb3 --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonAgentTestManager.java @@ -0,0 +1,455 @@ +package org.apache.stratos.python.cartridge.agent.test;/* + * 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. + */ + +import org.apache.activemq.broker.BrokerService; +import org.apache.commons.exec.*; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.stratos.common.threading.StratosThreadPool; +import org.apache.stratos.messaging.broker.publish.EventPublisher; +import org.apache.stratos.messaging.broker.publish.EventPublisherPool; +import org.apache.stratos.messaging.event.Event; +import org.apache.stratos.messaging.listener.instance.status.InstanceActivatedEventListener; +import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEventListener; +import org.apache.stratos.messaging.message.receiver.instance.status.InstanceStatusEventReceiver; +import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; +import org.apache.stratos.messaging.util.MessagingUtil; + +import java.io.*; +import java.net.ServerSocket; +import java.net.Socket; +import java.util.*; +import java.util.concurrent.ExecutorService; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +public class PythonAgentTestManager { + protected final Properties integrationProperties = new Properties(); + private static final Log log = LogFactory.getLog(PythonAgentTestManager.class); + protected BrokerService broker = new BrokerService(); + + public final long TIMEOUT = 180000; + public static final String NEW_LINE = System.getProperty("line.separator"); + public static final String ACTIVEMQ_AMQP_BIND_ADDRESS = "activemq.amqp.bind.address"; + public static final String ACTIVEMQ_MQTT_BIND_ADDRESS = "activemq.mqtt.bind.address"; + public static final String CEP_PORT = "cep.port"; + public static final String DISTRIBUTION_NAME = "distribution.name"; + protected final UUID PYTHON_AGENT_DIR_NAME = UUID.randomUUID(); + + protected Map<Integer, ServerSocket> serverSocketMap = new HashMap<>(); + protected Map<String, Executor> executorList = new HashMap<String, Executor>(); + + protected int cepPort; + protected String amqpBindAddress; + protected String mqttBindAddress; + protected String distributionName; + + protected boolean eventReceiverInitiated = false; + protected TopologyEventReceiver topologyEventReceiver; + protected InstanceStatusEventReceiver instanceStatusEventReceiver; + protected boolean instanceStarted; + protected boolean instanceActivated; + protected ByteArrayOutputStreamLocal outputStream; + + /** + * Setup method for test method testPythonCartridgeAgent + */ + protected void setup(String resourcePath) { + try { + startBroker(); + } + catch (Exception e) { + log.error("Error while starting MB", e); + return; + } + if (!this.eventReceiverInitiated) { + ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 15); + topologyEventReceiver = new TopologyEventReceiver(); + topologyEventReceiver.setExecutorService(executorService); + topologyEventReceiver.execute(); + + instanceStatusEventReceiver = new InstanceStatusEventReceiver(); + instanceStatusEventReceiver.setExecutorService(executorService); + instanceStatusEventReceiver.execute(); + + this.instanceStarted = false; + instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() { + @Override + protected void onEvent(Event event) { + log.info("Instance started event received"); + instanceStarted = true; + } + }); + + this.instanceActivated = false; + instanceStatusEventReceiver.addEventListener(new InstanceActivatedEventListener() { + @Override + protected void onEvent(Event event) { + log.info("Instance activated event received"); + instanceActivated = true; + } + }); + + this.eventReceiverInitiated = true; + } + // Simulate CEP server socket + startServerSocket(cepPort); + String agentPath = setupPythonAgent(resourcePath); + log.info("Python agent working directory name: " + PYTHON_AGENT_DIR_NAME); + log.info("Starting python cartridge agent..."); + this.outputStream = executeCommand("python " + agentPath + "/agent.py > " + + PythonAgentTestManager.class.getResource(File.separator).getPath() + "/../" + PYTHON_AGENT_DIR_NAME + + "/cartridge-agent-console.log"); + } + + protected void tearDown() { + tearDown(null); + } + + /** + * TearDown method for test method testPythonCartridgeAgent + */ + protected void tearDown(String sourcePath) { + for (Map.Entry<String, Executor> entry : executorList.entrySet()) { + try { + String commandText = entry.getKey(); + Executor executor = entry.getValue(); + log.info("Terminating process: " + commandText); + executor.setExitValue(0); + executor.getWatchdog().destroyProcess(); + } + catch (Exception ignore) { + } + } + // wait until everything cleans up to avoid connection errors + sleep(1000); + for (ServerSocket serverSocket : serverSocketMap.values()) { + try { + log.info("Stopping socket server: " + serverSocket.getLocalSocketAddress()); + serverSocket.close(); + } + catch (IOException ignore) { + } + } + + try { + log.info("Deleting source checkout folder..."); + FileUtils.deleteDirectory(new File(sourcePath)); + } + catch (Exception ignore) { + } + this.instanceStatusEventReceiver.terminate(); + this.topologyEventReceiver.terminate(); + + this.instanceActivated = false; + this.instanceStarted = false; + try { + broker.stop(); + } + catch (Exception e) { + log.error("Error while stopping the broker service", e); + } + } + + public PythonAgentTestManager() { + try { + integrationProperties + .load(PythonAgentTestManager.class.getResourceAsStream("/integration-test.properties")); + distributionName = integrationProperties.getProperty(DISTRIBUTION_NAME); + amqpBindAddress = integrationProperties.getProperty(ACTIVEMQ_AMQP_BIND_ADDRESS); + mqttBindAddress = integrationProperties.getProperty(ACTIVEMQ_MQTT_BIND_ADDRESS); + cepPort = Integer.parseInt(integrationProperties.getProperty(CEP_PORT)); + log.info("PCA integration properties: " + integrationProperties.toString()); + } + catch (IOException e) { + log.error("Error loading integration-test.properties file from classpath. Please make sure that file " + + "exists in classpath.", e); + } + } + + protected void startBroker() throws Exception { + broker.addConnector(amqpBindAddress); + broker.addConnector(mqttBindAddress); + broker.setBrokerName("testBroker"); + broker.setDataDirectory( + PythonAgentTestManager.class.getResource("/").getPath() + "/../" + PYTHON_AGENT_DIR_NAME + + "/activemq-data"); + broker.start(); + log.info("Broker service started!"); + } + + protected void startCommunicatorThread() { + Thread communicatorThread = new Thread(new Runnable() { + @Override + public void run() { + List<String> outputLines = new ArrayList<String>(); + while (!outputStream.isClosed()) { + List<String> newLines = getNewLines(outputLines, outputStream.toString()); + if (newLines.size() > 0) { + for (String line : newLines) { + if (line.contains("Exception in thread") || line.contains("ERROR")) { + try { + throw new RuntimeException(line); + } + catch (Exception e) { + log.error("ERROR found in PCA log", e); + } + } + log.info(line); + } + } + sleep(100); + } + } + }); + communicatorThread.start(); + } + + /** + * Start server socket + * + * @param port + */ + protected void startServerSocket(final int port) { + Thread socketThread = new Thread(new Runnable() { + @Override + public void run() { + while (true) { // do this infinitely until test is complete + try { + ServerSocket serverSocket = new ServerSocket(port); + serverSocketMap.put(port, serverSocket); + log.info("Server socket started on port: " + port); + Socket socket = serverSocket.accept(); + log.info("Client connected to [port] " + port); + + InputStream is = socket.getInputStream(); + byte[] buffer = new byte[1024]; + int read; + while (true) { + if (socket.isClosed()) { + log.info("Socket for [port] " + port + " has been closed."); + break; + } + if ((read = is.read(buffer)) != -1) { + String output = new String(buffer, 0, read); + log.info("Message received for [port] " + port + ", [message] " + output); + } + } + } + catch (IOException e) { + String message = "Could not start server socket: [port] " + port; + log.error(message, e); + throw new RuntimeException(message, e); + } + } + } + }); + socketThread.start(); + } + + + protected static String getResourcesPath(String resourcesPath) { + return PythonAgentTestManager.class.getResource("/").getPath() + "/../../src/test/resources" + resourcesPath; + } + + /** + * Copy python agent distribution to a new folder, extract it and copy sample configuration files + * + * @return + */ + protected String setupPythonAgent(String resourcesPath) { + try { + log.info("Setting up python cartridge agent..."); + + + String srcAgentPath = PythonAgentTestManager.class.getResource("/").getPath() + + "/../../../distribution/target/" + distributionName + ".zip"; + String unzipDestPath = + PythonAgentTestManager.class.getResource("/").getPath() + "/../" + PYTHON_AGENT_DIR_NAME + "/"; + //FileUtils.copyFile(new File(srcAgentPath), new File(destAgentPath)); + unzip(srcAgentPath, unzipDestPath); + String destAgentPath = PythonAgentTestManager.class.getResource("/").getPath() + "/../" + + PYTHON_AGENT_DIR_NAME + "/" + distributionName; + + String srcAgentConfPath = getResourcesPath(resourcesPath) + "/agent.conf"; + String destAgentConfPath = destAgentPath + "/agent.conf"; + FileUtils.copyFile(new File(srcAgentConfPath), new File(destAgentConfPath)); + + String srcLoggingIniPath = getResourcesPath(resourcesPath) + "/logging.ini"; + String destLoggingIniPath = destAgentPath + "/logging.ini"; + FileUtils.copyFile(new File(srcLoggingIniPath), new File(destLoggingIniPath)); + + String srcPayloadPath = getResourcesPath(resourcesPath) + "/payload"; + String destPayloadPath = destAgentPath + "/payload"; + FileUtils.copyDirectory(new File(srcPayloadPath), new File(destPayloadPath)); + + log.info("Changing extension scripts permissions"); + File extensionsPath = new File(destAgentPath + "/extensions/bash"); + File[] extensions = extensionsPath.listFiles(); + for (File extension : extensions) { + extension.setExecutable(true); + } + + log.info("Python cartridge agent setup completed"); + + return destAgentPath; + } + catch (Exception e) { + String message = "Could not copy cartridge agent distribution"; + log.error(message, e); + throw new RuntimeException(message, e); + } + } + + private void unzip(String zipFilePath, String destDirectory) throws IOException { + File destDir = new File(destDirectory); + if (!destDir.exists()) { + destDir.mkdir(); + } + ZipInputStream zipIn = new ZipInputStream(new FileInputStream(zipFilePath)); + ZipEntry entry = zipIn.getNextEntry(); + // iterates over entries in the zip file + while (entry != null) { + String filePath = destDirectory + File.separator + entry.getName(); + if (!entry.isDirectory()) { + // if the entry is a file, extracts it + extractFile(zipIn, filePath); + } else { + // if the entry is a directory, make the directory + File dir = new File(filePath); + dir.mkdir(); + } + zipIn.closeEntry(); + entry = zipIn.getNextEntry(); + } + zipIn.close(); + } + + private void extractFile(ZipInputStream zipIn, String filePath) throws IOException { + BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath)); + byte[] bytesIn = new byte[4096]; + int read = 0; + while ((read = zipIn.read(bytesIn)) != -1) { + bos.write(bytesIn, 0, read); + } + bos.close(); + } + + /** + * Execute shell command + * + * @param commandText + */ + protected ByteArrayOutputStreamLocal executeCommand(final String commandText) { + final ByteArrayOutputStreamLocal outputStream = new ByteArrayOutputStreamLocal(); + try { + CommandLine commandline = CommandLine.parse(commandText); + DefaultExecutor exec = new DefaultExecutor(); + PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream); + exec.setWorkingDirectory(new File( + PythonAgentTestManager.class.getResource("/").getPath() + "/../" + PYTHON_AGENT_DIR_NAME)); + exec.setStreamHandler(streamHandler); + ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT); + exec.setWatchdog(watchdog); + exec.execute(commandline, new ExecuteResultHandler() { + @Override + public void onProcessComplete(int i) { + log.info(commandText + " process completed"); + } + + @Override + public void onProcessFailed(ExecuteException e) { + log.error(commandText + " process failed", e); + } + }); + executorList.put(commandText, exec); + return outputStream; + } + catch (Exception e) { + log.error(outputStream.toString(), e); + throw new RuntimeException(e); + } + } + + /** + * Sleep current thread + * + * @param time + */ + protected void sleep(long time) { + try { + Thread.sleep(time); + } + catch (InterruptedException ignore) { + } + } + + /** + * Return new lines found in the output + * + * @param currentOutputLines current output lines + * @param output output + * @return + */ + protected List<String> getNewLines(List<String> currentOutputLines, String output) { + List<String> newLines = new ArrayList<String>(); + + if (StringUtils.isNotBlank(output)) { + String[] lines = output.split(NEW_LINE); + for (String line : lines) { + if (!currentOutputLines.contains(line)) { + currentOutputLines.add(line); + newLines.add(line); + } + } + } + return newLines; + } + + /** + * Publish messaging event + * + * @param event + */ + protected void publishEvent(Event event) { + String topicName = MessagingUtil.getMessageTopicName(event); + EventPublisher eventPublisher = EventPublisherPool.getPublisher(topicName); + eventPublisher.publish(event); + } + + + /** + * Implements ByteArrayOutputStream.isClosed() method + */ + protected class ByteArrayOutputStreamLocal extends org.apache.commons.io.output.ByteArrayOutputStream { + private boolean closed; + + @Override + public void close() throws IOException { + super.close(); + closed = true; + } + + public boolean isClosed() { + return closed; + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonTestManager.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonTestManager.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonTestManager.java deleted file mode 100644 index 68cca0c..0000000 --- a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/PythonTestManager.java +++ /dev/null @@ -1,411 +0,0 @@ -package org.apache.stratos.python.cartridge.agent.test;/* - * 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. - */ - -import org.apache.activemq.broker.BrokerService; -import org.apache.commons.exec.*; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.threading.StratosThreadPool; -import org.apache.stratos.messaging.broker.publish.EventPublisher; -import org.apache.stratos.messaging.broker.publish.EventPublisherPool; -import org.apache.stratos.messaging.event.Event; -import org.apache.stratos.messaging.listener.instance.status.InstanceActivatedEventListener; -import org.apache.stratos.messaging.listener.instance.status.InstanceStartedEventListener; -import org.apache.stratos.messaging.message.receiver.instance.status.InstanceStatusEventReceiver; -import org.apache.stratos.messaging.message.receiver.topology.TopologyEventReceiver; -import org.apache.stratos.messaging.util.MessagingUtil; - -import java.io.*; -import java.net.ServerSocket; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -public class PythonTestManager { - protected final Properties integrationProperties = new Properties(); - private static final Log log = LogFactory.getLog(PythonTestManager.class); - protected BrokerService broker = new BrokerService(); - - public final long TIMEOUT = 180000; - public static final String NEW_LINE = System.getProperty("line.separator"); - public static final String ACTIVEMQ_AMQP_BIND_ADDRESS = "activemq.amqp.bind.address"; - public static final String ACTIVEMQ_MQTT_BIND_ADDRESS = "activemq.mqtt.bind.address"; - public static final String CEP_PORT = "cep.port"; - public static final String DISTRIBUTION_NAME = "distribution.name"; - protected final UUID PYTHON_AGENT_DIR_NAME = UUID.randomUUID(); - - protected List<ServerSocket> serverSocketList = new ArrayList<ServerSocket>(); - protected Map<String, Executor> executorList = new HashMap<String, Executor>(); - - protected int cepPort; - protected String amqpBindAddress; - protected String mqttBindAddress; - protected String distributionName; - - protected boolean eventReceiverInitiated = false; - protected TopologyEventReceiver topologyEventReceiver; - protected InstanceStatusEventReceiver instanceStatusEventReceiver; - protected boolean instanceStarted; - protected boolean instanceActivated; - protected ByteArrayOutputStreamLocal outputStream; - - /** - * Setup method for test method testPythonCartridgeAgent - */ - protected void setup(String resourcePath) { - try { - startBroker(); - } - catch (Exception e) { - log.error("Error while starting MB", e); - return; - } - if (!this.eventReceiverInitiated) { - ExecutorService executorService = StratosThreadPool.getExecutorService("TEST_THREAD_POOL", 15); - topologyEventReceiver = new TopologyEventReceiver(); - topologyEventReceiver.setExecutorService(executorService); - topologyEventReceiver.execute(); - - instanceStatusEventReceiver = new InstanceStatusEventReceiver(); - instanceStatusEventReceiver.setExecutorService(executorService); - instanceStatusEventReceiver.execute(); - - this.instanceStarted = false; - instanceStatusEventReceiver.addEventListener(new InstanceStartedEventListener() { - @Override - protected void onEvent(Event event) { - log.info("Instance started event received"); - instanceStarted = true; - } - }); - - this.instanceActivated = false; - instanceStatusEventReceiver.addEventListener(new InstanceActivatedEventListener() { - @Override - protected void onEvent(Event event) { - log.info("Instance activated event received"); - instanceActivated = true; - } - }); - - this.eventReceiverInitiated = true; - } - // Simulate CEP server socket - startServerSocket(cepPort); - String agentPath = setupPythonAgent(resourcePath); - log.info("Python agent working directory name: " + PYTHON_AGENT_DIR_NAME); - log.info("Starting python cartridge agent..."); - this.outputStream = executeCommand("python " + agentPath + "/agent.py > " + - PythonTestManager.class.getResource(File.separator).getPath() + "/../" + PYTHON_AGENT_DIR_NAME + - "/cartridge-agent-console.log"); - } - - protected void tearDown() { - tearDown(null); - } - - /** - * TearDown method for test method testPythonCartridgeAgent - */ - protected void tearDown(String sourcePath) { - for (Map.Entry<String, Executor> entry : executorList.entrySet()) { - try { - String commandText = entry.getKey(); - Executor executor = entry.getValue(); - log.info("Terminating process: " + commandText); - executor.setExitValue(0); - executor.getWatchdog().destroyProcess(); - } - catch (Exception ignore) { - } - } - for (ServerSocket serverSocket : serverSocketList) { - try { - log.info("Stopping socket server: " + serverSocket.getLocalSocketAddress()); - serverSocket.close(); - } - catch (IOException ignore) { - } - } - - try { - log.info("Deleting source checkout folder..."); - FileUtils.deleteDirectory(new File(sourcePath)); - } - catch (Exception ignore) { - } - - this.instanceStatusEventReceiver.terminate(); - this.topologyEventReceiver.terminate(); - - this.instanceActivated = false; - this.instanceStarted = false; - // wait until everything cleans up to avoid connection errors - sleep(1000); - try { - broker.stop(); - } - catch (Exception e) { - log.error("Error while stopping the broker service", e); - } - } - - public PythonTestManager() { - try { - integrationProperties - .load(PythonTestManager.class.getResourceAsStream("/integration-test.properties")); - distributionName = integrationProperties.getProperty(DISTRIBUTION_NAME); - amqpBindAddress = integrationProperties.getProperty(ACTIVEMQ_AMQP_BIND_ADDRESS); - mqttBindAddress = integrationProperties.getProperty(ACTIVEMQ_MQTT_BIND_ADDRESS); - cepPort = Integer.parseInt(integrationProperties.getProperty(CEP_PORT)); - log.info("PCA integration properties: " + integrationProperties.toString()); - } - catch (IOException e) { - log.error("Error loading integration-test.properties file from classpath. Please make sure that file " + - "exists in classpath.", e); - } - } - - protected void startBroker() throws Exception { - broker.addConnector(amqpBindAddress); - broker.addConnector(mqttBindAddress); - broker.setBrokerName("testBroker"); - broker.setDataDirectory( - PythonTestManager.class.getResource("/").getPath() + "/../" + PYTHON_AGENT_DIR_NAME + - "/activemq-data"); - broker.start(); - log.info("Broker service started!"); - } - - /** - * Start server socket - * - * @param port - */ - protected void startServerSocket(final int port) { - Thread socketThread = new Thread(new Runnable() { - @Override - public void run() { - try { - ServerSocket serverSocket = new ServerSocket(port); - serverSocketList.add(serverSocket); - log.info("Server socket started on port: " + port); - serverSocket.accept(); - } - catch (IOException e) { - String message = "Could not start server socket: [port] " + port; - log.error(message, e); - throw new RuntimeException(message, e); - } - } - }); - socketThread.start(); - } - - - protected static String getResourcesPath(String resourcesPath) { - return PythonTestManager.class.getResource("/").getPath() + "/../../src/test/resources" + resourcesPath; - } - - /** - * Copy python agent distribution to a new folder, extract it and copy sample configuration files - * - * @return - */ - protected String setupPythonAgent(String resourcesPath) { - try { - log.info("Setting up python cartridge agent..."); - - - String srcAgentPath = PythonTestManager.class.getResource("/").getPath() + - "/../../../distribution/target/" + distributionName + ".zip"; - String unzipDestPath = - PythonTestManager.class.getResource("/").getPath() + "/../" + PYTHON_AGENT_DIR_NAME + "/"; - //FileUtils.copyFile(new File(srcAgentPath), new File(destAgentPath)); - unzip(srcAgentPath, unzipDestPath); - String destAgentPath = PythonTestManager.class.getResource("/").getPath() + "/../" + - PYTHON_AGENT_DIR_NAME + "/" + distributionName; - - String srcAgentConfPath = getResourcesPath(resourcesPath) + "/agent.conf"; - String destAgentConfPath = destAgentPath + "/agent.conf"; - FileUtils.copyFile(new File(srcAgentConfPath), new File(destAgentConfPath)); - - String srcLoggingIniPath = getResourcesPath(resourcesPath) + "/logging.ini"; - String destLoggingIniPath = destAgentPath + "/logging.ini"; - FileUtils.copyFile(new File(srcLoggingIniPath), new File(destLoggingIniPath)); - - String srcPayloadPath = getResourcesPath(resourcesPath) + "/payload"; - String destPayloadPath = destAgentPath + "/payload"; - FileUtils.copyDirectory(new File(srcPayloadPath), new File(destPayloadPath)); - - log.info("Changing extension scripts permissions"); - File extensionsPath = new File(destAgentPath + "/extensions/bash"); - File[] extensions = extensionsPath.listFiles(); - for (File extension : extensions) { - extension.setExecutable(true); - } - - log.info("Python cartridge agent setup completed"); - - return destAgentPath; - } - catch (Exception e) { - String message = "Could not copy cartridge agent distribution"; - log.error(message, e); - throw new RuntimeException(message, e); - } - } - - private void unzip(String zipFilePath, String destDirectory) throws IOException { - File destDir = new File(destDirectory); - if (!destDir.exists()) { - destDir.mkdir(); - } - ZipInputStream zipIn = new ZipInputStream(new FileInputStream(zipFilePath)); - ZipEntry entry = zipIn.getNextEntry(); - // iterates over entries in the zip file - while (entry != null) { - String filePath = destDirectory + File.separator + entry.getName(); - if (!entry.isDirectory()) { - // if the entry is a file, extracts it - extractFile(zipIn, filePath); - } else { - // if the entry is a directory, make the directory - File dir = new File(filePath); - dir.mkdir(); - } - zipIn.closeEntry(); - entry = zipIn.getNextEntry(); - } - zipIn.close(); - } - - private void extractFile(ZipInputStream zipIn, String filePath) throws IOException { - BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath)); - byte[] bytesIn = new byte[4096]; - int read = 0; - while ((read = zipIn.read(bytesIn)) != -1) { - bos.write(bytesIn, 0, read); - } - bos.close(); - } - - /** - * Execute shell command - * - * @param commandText - */ - protected ByteArrayOutputStreamLocal executeCommand(final String commandText) { - final ByteArrayOutputStreamLocal outputStream = new ByteArrayOutputStreamLocal(); - try { - CommandLine commandline = CommandLine.parse(commandText); - DefaultExecutor exec = new DefaultExecutor(); - PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream); - exec.setWorkingDirectory(new File( - PythonTestManager.class.getResource("/").getPath() + "/../" + PYTHON_AGENT_DIR_NAME)); - exec.setStreamHandler(streamHandler); - ExecuteWatchdog watchdog = new ExecuteWatchdog(TIMEOUT); - exec.setWatchdog(watchdog); - exec.execute(commandline, new ExecuteResultHandler() { - @Override - public void onProcessComplete(int i) { - log.info(commandText + " process completed"); - } - - @Override - public void onProcessFailed(ExecuteException e) { - log.error(commandText + " process failed", e); - } - }); - executorList.put(commandText, exec); - return outputStream; - } - catch (Exception e) { - log.error(outputStream.toString(), e); - throw new RuntimeException(e); - } - } - - /** - * Sleep current thread - * - * @param time - */ - protected void sleep(long time) { - try { - Thread.sleep(time); - } - catch (InterruptedException ignore) { - } - } - - /** - * Return new lines found in the output - * - * @param currentOutputLines current output lines - * @param output output - * @return - */ - protected List<String> getNewLines(List<String> currentOutputLines, String output) { - List<String> newLines = new ArrayList<String>(); - - if (StringUtils.isNotBlank(output)) { - String[] lines = output.split(NEW_LINE); - for (String line : lines) { - if (!currentOutputLines.contains(line)) { - currentOutputLines.add(line); - newLines.add(line); - } - } - } - return newLines; - } - - /** - * Publish messaging event - * - * @param event - */ - protected void publishEvent(Event event) { - String topicName = MessagingUtil.getMessageTopicName(event); - EventPublisher eventPublisher = EventPublisherPool.getPublisher(topicName); - eventPublisher.publish(event); - } - - - /** - * Implements ByteArrayOutputStream.isClosed() method - */ - protected class ByteArrayOutputStreamLocal extends org.apache.commons.io.output.ByteArrayOutputStream { - private boolean closed; - - @Override - public void close() throws IOException { - super.close(); - closed = true; - } - - public boolean isClosed() { - return closed; - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/StartUpTest.java ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/StartUpTest.java b/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/StartUpTest.java deleted file mode 100755 index 36a8cd5..0000000 --- a/products/python-cartridge-agent/integration/src/test/java/org/apache/stratos/python.cartridge.agent/test/StartUpTest.java +++ /dev/null @@ -1,171 +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 org.apache.stratos.python.cartridge.agent.test; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.stratos.common.domain.LoadBalancingIPType; -import org.apache.stratos.messaging.domain.topology.*; -import org.apache.stratos.messaging.event.topology.CompleteTopologyEvent; -import org.apache.stratos.messaging.event.topology.MemberInitializedEvent; -import org.testng.annotations.AfterSuite; -import org.testng.annotations.BeforeSuite; -import org.testng.annotations.Test; - -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import static junit.framework.Assert.assertTrue; - -public class StartUpTest extends PythonTestManager { - private static final Log log = LogFactory.getLog(StartUpTest.class); - private static final int STARTUP_TIMEOUT = 30000; - private static final String RESOURCES_PATH = "/suite-1"; - private static final String CLUSTER_ID = "php.php.domain"; - private static final String DEPLOYMENT_POLICY_NAME = "deployment-policy-1"; - private static final String AUTOSCALING_POLICY_NAME = "autoscaling-policy-1"; - private static final String APP_ID = "application-1"; - private static final String MEMBER_ID = "php.member-1"; - private static final String CLUSTER_INSTANCE_ID = "cluster-1-instance-1"; - private static final String NETWORK_PARTITION_ID = "network-partition-1"; - private static final String PARTITION_ID = "partition-1"; - private static final String TENANT_ID = "-1234"; - private static final String SERVICE_NAME = "php"; - private static final String SOURCE_PATH = "/tmp/stratos-pca-startup-test-app-path/"; - - - @BeforeSuite - public void setupStartUpTest() { - // Set jndi.properties.dir system property for initializing event publishers and receivers - System.setProperty("jndi.properties.dir", getResourcesPath(RESOURCES_PATH)); - - // start Python agent with configurations provided in resource path - setup(RESOURCES_PATH); - } - - - /** - * TearDown method for test method testPythonCartridgeAgent - */ - @AfterSuite - public void tearDownStartUpTest() { - tearDown(); - } - - @Test(timeOut = STARTUP_TIMEOUT) - public void testPythonCartridgeAgent() { - Thread communicatorThread = new Thread(new Runnable() { - @Override - public void run() { - while (!eventReceiverInitiated) { - sleep(2000); - } - List<String> outputLines = new ArrayList<String>(); - while (!outputStream.isClosed()) { - List<String> newLines = getNewLines(outputLines, outputStream.toString()); - if (newLines.size() > 0) { - for (String line : newLines) { - if (line.contains("Exception in thread") || line.contains("ERROR")) { - try { - throw new RuntimeException(line); - } - catch (Exception e) { - log.error("ERROR found in PCA log", e); - } - } - if (line.contains("Subscribed to 'topology/#'")) { - sleep(2000); - // Send complete topology event - log.info("Publishing complete topology event..."); - Topology topology = createTestTopology(); - CompleteTopologyEvent completeTopologyEvent = new CompleteTopologyEvent(topology); - publishEvent(completeTopologyEvent); - log.info("Complete topology event published"); - - // Publish member initialized event - log.info("Publishing member initialized event..."); - MemberInitializedEvent memberInitializedEvent = new MemberInitializedEvent( - SERVICE_NAME, CLUSTER_ID, CLUSTER_INSTANCE_ID, MEMBER_ID, NETWORK_PARTITION_ID, - PARTITION_ID - ); - publishEvent(memberInitializedEvent); - log.info("Member initialized event published"); - - // Simulate server socket - startServerSocket(8080); - } - /* - if (line.contains("Artifact repository found")) { - // Send artifact updated event - ArrayList<ArtifactUpdatedEvent> list = getArtifactUpdatedEventsAsParams(); - for (ArtifactUpdatedEvent artifactUpdatedEvent : list) { - publishEvent(artifactUpdatedEvent); - } - }*/ - log.info(line); - } - } - sleep(100); - } - } - }); - - communicatorThread.start(); - - while (!instanceActivated) { - // wait until the instance activated event is received. - sleep(2000); - } - - assertTrue("Instance started event was not received", instanceStarted); - assertTrue("Instance activated event was not received", instanceActivated); - } - - - /** - * Create test topology - * - * @return - */ - private Topology createTestTopology() { - Topology topology = new Topology(); - Service service = new Service(SERVICE_NAME, ServiceType.SingleTenant); - topology.addService(service); - - Cluster cluster = new Cluster(service.getServiceName(), CLUSTER_ID, DEPLOYMENT_POLICY_NAME, - AUTOSCALING_POLICY_NAME, APP_ID); - service.addCluster(cluster); - - Member member = new Member(service.getServiceName(), cluster.getClusterId(), MEMBER_ID, - CLUSTER_INSTANCE_ID, NETWORK_PARTITION_ID, PARTITION_ID, LoadBalancingIPType.Private, - System.currentTimeMillis()); - - member.setDefaultPrivateIP("10.0.0.1"); - member.setDefaultPublicIP("20.0.0.1"); - Properties properties = new Properties(); - properties.setProperty("prop1", "value1"); - member.setProperties(properties); - member.setStatus(MemberStatus.Created); - cluster.addMember(member); - - return topology; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml b/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml index 35e60e3..c102914 100755 --- a/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml +++ b/products/python-cartridge-agent/integration/src/test/resources/pca-testing1.xml @@ -23,7 +23,7 @@ <suite name="PythonCartridgeAgentIntegrationSuite1"> <test name="PCATest"> <classes> - <class name="org.apache.stratos.python.cartridge.agent.test.StartUpTest"/> + <class name="org.apache.stratos.python.cartridge.agent.test.AgentStartupTest"/> </classes> </test> </suite> http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml b/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml new file mode 100755 index 0000000..f20cf20 --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/resources/pca-testing3.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ 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. + --> + +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; > + +<suite name="PythonCartridgeAgentIntegrationSuite3"> + <test name="PCATest"> + <classes> + <class name="org.apache.stratos.python.cartridge.agent.test.ADCMTAppTest"/> + </classes> + </test> +</suite> http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf b/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf index dc34a1f..eae5003 100755 --- a/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf +++ b/products/python-cartridge-agent/integration/src/test/resources/suite-1/agent.conf @@ -39,8 +39,7 @@ monitoring.server.port =7612 monitoring.server.secure.port =7712 monitoring.server.admin.username =admin monitoring.server.admin.password =admin -#log.file.paths =/home/chamilad/dev/wso2esb-4.8.1/repository/logs/wso2carbon.log log.file.paths =/tmp/agent.screen-startup-test.log metadata.service.url =https://localhost:9443 super.tenant.repository.path =/repository/deployment/server/ -tenant.repository.path =/repository/tenants/ \ No newline at end of file +tenant.repository.path =/repository/tenants/ http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf b/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf index f05a00e..fd3e423 100755 --- a/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf +++ b/products/python-cartridge-agent/integration/src/test/resources/suite-2/agent.conf @@ -39,8 +39,7 @@ monitoring.server.port =7612 monitoring.server.secure.port =7712 monitoring.server.admin.username =admin monitoring.server.admin.password =admin -#log.file.paths =/home/chamilad/dev/wso2esb-4.8.1/repository/logs/wso2carbon.log log.file.paths =/tmp/agent.screen-adc-test.log metadata.service.url =https://localhost:9443 super.tenant.repository.path =/repository/deployment/server/ -tenant.repository.path =/repository/tenants/ \ No newline at end of file +tenant.repository.path =/repository/tenants/ http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf b/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf new file mode 100755 index 0000000..0ee1dce --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/resources/suite-3/agent.conf @@ -0,0 +1,45 @@ +# 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. + +[agent] +mb.ip =localhost +mb.port =1885 +listen.address =localhost +thrift.receiver.ip =localhost +thrift.receiver.port =7712 +thrift.server.admin.username =admin +thrift.server.admin.password =admin +cep.stats.publisher.enabled =true +lb.private.ip = +lb.public.ip = +enable.artifact.update =true +auto.commit =true +auto.checkout =true +artifact.update.interval =15 +artifact.clone.retries =5 +artifact.clone.interval =10 +port.check.timeout =600000 +enable.data.publisher =false +monitoring.server.ip =localhost +monitoring.server.port =7612 +monitoring.server.secure.port =7712 +monitoring.server.admin.username =admin +monitoring.server.admin.password =admin +log.file.paths =/tmp/agent.screen-adc-mt-test.log +metadata.service.url =https://localhost:9443 +super.tenant.repository.path =/repository/deployment/server/ +tenant.repository.path =/repository/tenants/ http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties b/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties new file mode 100755 index 0000000..beefe3c --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/resources/suite-3/jndi.properties @@ -0,0 +1,22 @@ +# +# 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. +# + +connectionfactoryName=TopicConnectionFactory +java.naming.provider.url=tcp://localhost:61617 +java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini b/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini new file mode 100755 index 0000000..15cad9b --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/resources/suite-3/logging.ini @@ -0,0 +1,52 @@ +# 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. + + +[formatters] +keys=default + +[formatter_default] +format=[%(asctime)s] %(levelname)s {%(filename)s:%(funcName)s} - %(message)s +class=logging.Formatter + +[handlers] +keys=console, error_file, log_file + +[handler_console] +class=logging.StreamHandler +formatter=default +args=tuple() + +[handler_log_file] +class=logging.FileHandler +level=DEBUG +formatter=default +args=("agent.log", "w") + +[handler_error_file] +class=logging.FileHandler +level=ERROR +formatter=default +args=("error.log", "w") + +[loggers] +keys=root + +[logger_root] +level=DEBUG +formatter=default +handlers=console,error_file,log_file \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/64368325/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params b/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params new file mode 100755 index 0000000..ba9387b --- /dev/null +++ b/products/python-cartridge-agent/integration/src/test/resources/suite-3/payload/launch-params @@ -0,0 +1,2 @@ +APPLICATION_ID=application-3,SERVICE_NAME=tomcat-mt,HOST_NAME=tomcat.stratos.org,MULTITENANT=true,TENANT_ID=-1234, +TENANT_RANGE=*,CARTRIDGE_ALIAS=tomcat,CLUSTER_ID=tomcat.domain,CLUSTER_INSTANCE_ID=cluster-1-instance-1,CARTRIDGE_KEY=PUjpXCLujDhYr5A6,DEPLOYMENT=default,REPO_URL=https://github.com/imesh/stratos-php-applications.git,PORTS=8080,PUPPET_IP=127.0.0.1,PUPPET_HOSTNAME=puppet.apache.stratos.org,PUPPET_ENV=false,MEMBER_ID=tomcat.member-1,LB_CLUSTER_ID=null,NETWORK_PARTITION_ID=network-p1,PARTITION_ID=p1,APPLICATION_PATH=/tmp/pca-test-suite-3,MIN_COUNT=1,INTERNAL=false,CLUSTERING_PRIMARY_KEY=A,LOG_FILE_PATHS=/tmp/temp.log,PERSISTENCE_MAPPING=null
