Merge pull request #62 from jboss-openshift/wip-1.1

Adapt to new arquillian-cube

Author: spolti

README.md

@@ -29,8 +29,6 @@ Additional properties you **can** set / change.
 
 -Ddeployment.dir=[EAP deployment directory], default is "/opt/eap/standalone/deployments/"
 
--Dkubernetes.ignore.cleanup=(true|false) -- do we leave the test image, pod and services still running after the test is finished, default is "false"
-
 -Dcontainer.mgmt.port=[EAP container management port], default is 9990
 
 -Ddocker.username=[OpenShift username]

api/src/main/java/org/jboss/arquillian/ce/api/ConfigurationHandle.java

@@ -29,8 +29,6 @@
 public interface ConfigurationHandle {
     String getKubernetesMaster();
 
-    String getDockerUrl();
-
     String getApiVersion();
 
     String getNamespace();

api/src/main/java/org/jboss/arquillian/ce/api/TemplateParameter.java

@@ -32,7 +32,7 @@
  * @author Marko Luksa
  */
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
 public @interface TemplateParameter {
     String name();
     String value();

cube/pom.xml

@@ -32,12 +32,13 @@
         	<artifactId>arquillian-cube-openshift</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>openshift-client</artifactId>
+          <groupId>io.fabric8</groupId>
+          <artifactId>kubernetes-openshift-uberjar</artifactId>
+          <classifier>versioned</classifier>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.container</groupId>
             <artifactId>arquillian-ce-httpclient</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>

cube/src/main/java/org/jboss/arquillian/ce/cube/CECubeConfiguration.java

@@ -28,8 +28,6 @@
 import org.jboss.arquillian.ce.utils.Strings;
 import org.jboss.arquillian.ce.utils.TemplateConfiguration;
 
-import static org.jboss.arquillian.ce.utils.Strings.isNotNullOrEmpty;
-
 /**
  * CECubeConfiguration
  * <p/>
@@ -50,11 +48,6 @@ public class CECubeConfiguration extends TemplateConfiguration {
     public static CECubeConfiguration fromMap(final Map<String, String> props) {
         //XXX: need to rename arq.ce-cube properties.  arq extension properties cannot contain '.'
         final CECubeConfiguration config = new CECubeConfiguration();
-        config.setApiVersion(getProperty(props, "kubernetesApiVersion", config.getApiVersion()));
-        config.setIgnoreCleanup(Boolean.valueOf(getProperty(props, "kubernetesIgnoreCleanup", Boolean.toString(config.isIgnoreCleanup()))));
-        config.setKubernetesMaster(getProperty(props, "kubernetesMaster", config.getKubernetesMaster()));
-        config.setNamespacePrefix(getProperty(props, "kubernetesNamespacePrefix", config.getNamespacePrefix()));
-        config.setNamespace(getProperty(props, "kubernetesNamespace", config.getNamespace()));
         config.setOpenshiftPassword(getProperty(props, "openshiftPassword", config.getOpenshiftPassword()));
         config.setOpenshiftUsername(getProperty(props, "openshiftUsername", config.getOpenshiftUsername()));
         config.setRouterHost(getProperty(props, "routerHost", config.routerHost));
@@ -69,7 +62,6 @@ public static CECubeConfiguration fromMap(final Map<String, String> props) {
         config.setToken(getProperty(props, "kubernetesAuthToken", config.getToken()));
         config.setTrustCerts(Boolean.valueOf(getProperty(props, "kubernetesTrustCerts", Boolean.toString(config.isTrustCerts()))));
         config.loadApplications(props);
-        config.validate();
         return config;
     }
 

cube/src/main/java/org/jboss/arquillian/ce/cube/CECubeInitializer.java

@@ -53,15 +53,18 @@ public class CECubeInitializer {
     @ApplicationScoped
     private InstanceProducer<OpenShiftAdapter> openShiftAdapterProducer;
 
-    public void configure(@Observes ArquillianDescriptor arquillianDescriptor) {
+    public void configure(@Observes org.arquillian.cube.kubernetes.api.Configuration cubeConfig, ArquillianDescriptor arquillianDescriptor) {
         // read in our configuration
         CECubeConfiguration config = CECubeConfiguration.fromMap(arquillianDescriptor.extension("ce-cube").getExtensionProperties());
+        config.setCubeConfiguration(cubeConfig);
+        config.validate();
+
         configurationProducer.set(config);
         configurationHandleProducer.set(config);
     }
-    
+
     public void createOpenShiftAdapter(@Observes OpenShiftClient client, CECubeConfiguration configuration) {
         configuration.setClient(client);
-        openShiftAdapterProducer.set(new F8OpenShiftAdapter(client.getClientExt(), configuration));
+        openShiftAdapterProducer.set(new F8OpenShiftAdapter(client.getClient(), configuration));
     }
 }

cube/src/main/java/org/jboss/arquillian/ce/cube/CECubeOpenShiftExtension.java

@@ -23,17 +23,25 @@
 package org.jboss.arquillian.ce.cube;
 
 import org.jboss.arquillian.ce.cube.enrichers.RouteURLEnricher;
+import org.jboss.arquillian.ce.ext.ExternalDeploymentScenarioGenerator;
+import org.jboss.arquillian.ce.ext.LocalConfigurationResourceProvider;
+import org.jboss.arquillian.ce.ext.OpenShiftHandleResourceProvider;
+import org.jboss.arquillian.ce.ext.UtilsArchiveAppender;
+import org.jboss.arquillian.container.test.spi.client.deployment.AuxiliaryArchiveAppender;
+import org.jboss.arquillian.container.test.spi.client.deployment.DeploymentScenarioGenerator;
 import org.jboss.arquillian.core.spi.LoadableExtension;
 import org.jboss.arquillian.test.spi.TestEnricher;
+import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider;
 
 public class CECubeOpenShiftExtension implements LoadableExtension {
     public void register(ExtensionBuilder builder) {
         builder.observer(CECubeInitializer.class)
-               .observer(CubeOpenShiftOverrider.class)
-               .observer(CEProjectManager.class)
-               .observer(CEEnvironmentProcessor.class)
-               .observer(CEApplicationHandler.class);
+               .observer(CEEnvironmentProcessor.class);
 
         builder.service(TestEnricher.class, RouteURLEnricher.class);
+        builder.service(ResourceProvider.class, OpenShiftHandleResourceProvider.class);
+        builder.service(ResourceProvider.class, LocalConfigurationResourceProvider.class);
+        builder.service(AuxiliaryArchiveAppender.class, UtilsArchiveAppender.class);
+        builder.service(DeploymentScenarioGenerator.class, ExternalDeploymentScenarioGenerator.class);
     }
 }

cube/src/main/java/org/jboss/arquillian/ce/cube/CEEnvironmentProcessor.java

@@ -169,7 +169,7 @@ private void deleteEnvironment(final TestClass testClass, OpenShiftAdapter clien
     	StringResolver resolver;
     	String templateURL;
 
-        if (configuration.performCleanup()) {
+        if (configuration.getCubeConfiguration().isNamespaceCleanupEnabled()) {
             log.info(String.format("Deleting environment for %s", testClass.getName()));
             for(Template template : templates) {
             	// Delete pods and services related to each template