Feature/java integration tests #300

vanajamukkara · 2018-05-17T14:22:29Z

This is for the issue #299
Currently these tests cover QUICK_TEST use cases in run.sh for "Standalone" mode.

To run the tests,
mvn clean install -P java-integration-tests
or
mvn test-compile integration-test -P java-integration-tests

http://aseng-wiki.****/asengwiki/display/ASQA/Weblogic+Operator+Integration+Tests+in+Java

…locally

…es-operator into feature/java-integration-tests

rjeberhard · 2018-05-18T00:36:33Z

integration-tests/.gitignore

@@ -0,0 +1 @@
+/target/


There is a top-level .gitignore file, so this should be redundant

deleted this file

rjeberhard · 2018-05-18T00:38:07Z

integration-tests/pom.xml

@@ -0,0 +1,212 @@
+<!-- Copyright 2017, Oracle Corporation. All Rights Reserved. -->


License template for all files (okay to use XML comment style here)
// Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
// Licensed under the Universal Permissive License v 1.0 as shown at
// http://oss.oracle.com/licenses/upl.

added license in all files

rjeberhard · 2018-05-18T00:38:40Z

integration-tests/pom.xml

@@ -0,0 +1,212 @@
+<!-- Copyright 2017, Oracle Corporation. All Rights Reserved. -->
+<!-- This is unreleased proprietary source code of Oracle Corporation -->


Comment needs to be removed.

rjeberhard · 2018-05-18T00:39:53Z

integration-tests/pom.xml

+            <properties>
+                <src-integration-test>${project.basedir}/src/integration-tests/java</src-integration-test>
+                <resource-integration-test>${project.basedir}/src/integration-tests/resources</resource-integration-test>
+                <docker-image-name>container-registry.oracle.com/middleware/weblogic-kubernetes-operator:latest</docker-image-name>


I don't understand this. Why would we only test against the latest from OCR? Shouldn't we test against what we build?

I see that below you build to this image name. It's still kind of confusing though.

I changed the image name based on the git branch name, moved docker build to sh script as the image name is dynamic. please see the latest pom.xml and pullimages.sh is renamed to setupenv.sh.

rjeberhard · 2018-05-18T00:41:06Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/BaseTest.java

@@ -0,0 +1,201 @@
+package oracle.kubernetes.operator;


All Java files need the license

rjeberhard · 2018-05-18T00:46:51Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/ITSingleDomain.java

+
+  //@Test
+  public void testElkIntegration() {
+    //TODO in run.sh


Please either implement or remove.

rjeberhard · 2018-05-18T00:49:53Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/utils/Operator.java

+    String outputStr = TestUtils.executeCommand(cmd.toString());
+    logger.info("run " + outputStr);
+
+    //TODo: Add check for the image name from the Pod as in run.sh


Please implement or remove

rjeberhard · 2018-05-18T00:50:14Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/utils/Operator.java

+    //TODo: Add check for the image name from the Pod as in run.sh
+
+    if (!outputStr.contains(createScriptMessage)) {
+      //use logger


Please implement using logger or remove.

rjeberhard · 2018-05-18T00:52:16Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/utils/TestUtils.java

+      BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+      BufferedReader errReader = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+
+      //in some cases u may want to read process error stream as well


rjeberhard · 2018-05-18T00:56:47Z

integration-tests/src/integration-tests/resources/pullimages.sh

@@ -0,0 +1,8 @@
+docker pull wlsldi-v2.docker.oraclecorp.com/store-weblogic-12.2.1.3:latest


We can't expose these internal addresses

this is how its done in run.sh as well

please let me know if there other ways to do it

moreaut · 2018-05-18T01:45:27Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/BaseTest.java

+    File f = new File(BaseTest.class.getClassLoader().getResource(appPropsFile).getFile());
+    if (!f.exists()) {
+      throw new IllegalArgumentException(
+          "FAILURE: Invalid operator appp properties file " + appPropsFile);


Can you re-use any of the operator test utils dealing with inputs files and output directories?
e.g. operator/src/test/java/oracle/kubernetes/operator/utils/UserProjects.java ?

Or are you not able to use them because you're under a different root directory (integration-tests/src/...)?

moreaut · 2018-05-18T14:56:46Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/BaseTest.java

+  protected static Properties opProps = new Properties();
+  protected static Properties domainProps = new Properties();
+  protected static Properties appProps = new Properties();
+


Please add comments explaining what the protected static variables are used for. e.g. I'm not sure what the op/domain/app props files are used for. e.g. are opProps and domainProps the inputs files to the create operator / domain shell scripts?

moreaut · 2018-05-18T15:01:33Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/BaseTest.java

+ *
+ * @author Vanajakshi Mukkara
+ */
+public class BaseTest {


Why are all these properties (e.g. operator, ...) protected static with a setup method instead of member data with a constructor?

Why are they protected (v.s. private with getters and setters?)

moreaut · 2018-05-18T15:03:10Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/BaseTest.java

+  protected static String domainUid = "";
+  protected static String domainNS = "";
+
+  public static void setup() throws Exception {


This is a very long function. How about breaking it up into a bunch of smaller ones? Might help with re-use and it will make the code clearer.

moreaut · 2018-05-18T15:06:50Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/ITSingleDomain.java

+   */
+  @BeforeClass
+  public static void staticPrepare() throws Exception {
+    logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");


You're using this pattern of logger.info +++++ / begin / message in several places. How about writing a function that does it?

moreaut · 2018-05-18T15:08:06Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/ITSingleDomain.java

+    logger.info("BEGIN");
+    logger.info("Run once, Creating Operator & " + "waiting for the script to complete execution");
+
+    opPropsFile = "ITSingleDomain_op.properties";


Why aren't these args to setup? i.e. it seems odd to set static variables then call a setup function that uses them to do other stuff.

moreaut · 2018-05-18T16:00:54Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/utils/TestUtils.java

+    StringBuffer cmd = new StringBuffer();
+    cmd.append("kubectl get pod ").append(podName).append(" -n ").append(domainNS);
+
+    while (i < MAX_ITERATIONS_POD) {


How about adding a utility that does the looping where you can pass in the code that does the check?
v.s. repeating the while loop, sleep, max iterations stuff a bunch of places.

moreaut · 2018-05-18T16:02:10Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/utils/TestUtils.java

+        .append(clusterName)
+        .append("\")].replicas }'");
+    logger.fine("getClusterReplicas cmd =" + cmd);
+    String output = TestUtils.executeCommand(new String[] {"/bin/sh", "-c", cmd.toString()});


I think I've seen the /bin/sh -c stuff a bunch of places - how about adding another variant of executeCommand that does this?

moreaut · 2018-05-18T16:02:51Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/utils/TestUtils.java

+  }
+
+  private static int makeOperatorRestCall(
+      String operatorNS, String url, String jsonObjStr, String userProjectsDir) throws Exception {


Long function - split it up maybe?

moreaut · 2018-05-18T16:03:38Z

integration-tests/src/integration-tests/java/oracle/kubernetes/operator/utils/TestUtils.java

+        TestUtils.executeCommand(new String[] {"/bin/sh", "-c", opKeyDecodeCmd.toString()});
+    return keyFile.getAbsolutePath();
+  }
+


what does cleanupAll do and when should you call it?

moreaut · 2018-05-18T16:18:02Z

integration-tests/src/integration-tests/resources/ITSingleDomain_domain.properties

+adminServerName= admin-server
+domainName= base_domain
+domainUID= domain1
+startupControl= AUTO


Remove default values? e.g. startupControl = AUTO
(this will make it easier to migrate your tests to the new lifecycle and WDT stuff)

rjeberhard · 2018-05-23T13:32:46Z

@vanajamukkara I've figured out why the format validation isn't running on your files. You need to conform to standard Maven directory layouts. Please "git mv" integration-tests/src/integration-tests to integration-tests/src/test.

…es-operator into feature/java-integration-tests

…rc/test

…racle/weblogic-kubernetes-operator into feature/java-integration-tests

…es-operator into feature/java-integration-tests

vanajamukkara added 5 commits May 10, 2018 09:06

adding java integration tests for single domain use case which works …

5939172

…locally

changing profile name to java-integration-tests

f4de1d5

adding comments for property files

5104899

remove dangling images

4f9c179

Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…

843f03d

…es-operator into feature/java-integration-tests

rjeberhard requested changes May 18, 2018

View reviewed changes

rjeberhard requested review from russgold, anpanigr and moreaut May 18, 2018 00:57

moreaut reviewed May 18, 2018

View reviewed changes

vanajamukkara added 2 commits May 19, 2018 11:07

changes for Ryan comments on PR

e925957

fixing typo

9e67d50

vanajamukkara added 16 commits May 23, 2018 15:14

changes for Tom M review comments

88e2fb2

Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…

9f7a290

…es-operator into feature/java-integration-tests

rename integration-tests/src/integration-tests to integration-tests/s…

cd0e469

…rc/test

formatting changes

ef0d30d

changes for the pull request review comments

f9e8b84

wercker automation

3a4c102

install pre-reqs for maven

e358b12

fixing typo for profile

4021e3d

fix script error

53811ca

changing secret names for java tests

02b41f8

fixing script error

d97c3e6

chmod pv_root only for manual runs

28b86b6

adding docker registry secret

95eab5e

adding docker registry secret

c5cde58

create namespace

36e40ee

create namespace

53480e5

vanajamukkara added 29 commits June 11, 2018 13:11

changes for Ryan comments on PR

0c46a30

fixing typo

f9f6eea

changes for Tom M review comments

d62063d

rename integration-tests/src/integration-tests to integration-tests/s…

c6c2038

…rc/test

formatting changes

f79bbc0

changes for the pull request review comments

9a61388

wercker automation

1940972

install pre-reqs for maven

56370f8

fixing typo for profile

6c939a0

fix script error

881094d

changing secret names for java tests

ae5b85d

fixing script error

592df05

chmod pv_root only for manual runs

d4efe98

adding docker registry secret

a7909f4

adding docker registry secret

d5c520b

create namespace

b70c249

create namespace

eab8cf5

create pvroot

7c59381

debug statment

5f52972

using admin servername in t3 url inside pod

a9df293

using admin servername in t3 url inside pod

7efe44c

changes to use ExecCommand and ExecResult

2d8f391

adding debug statement

6b4363f

adding debug statement

2eae48b

docker password in double quotes

17ad685

use nodeport host for url

8f513f6

get replica cnt for load balance check

f67c802

Merge branch 'feature/java-integration-tests' of https://github.com/o…

03e2f73

…racle/weblogic-kubernetes-operator into feature/java-integration-tests

Merge branch 'develop' of https://github.com/oracle/weblogic-kubernet…

448474b

…es-operator into feature/java-integration-tests

rjeberhard merged commit e9982cd into develop Jun 14, 2018

		@@ -0,0 +1,212 @@
		<!-- Copyright 2017, Oracle Corporation. All Rights Reserved. -->

		@@ -0,0 +1,212 @@
		<!-- Copyright 2017, Oracle Corporation. All Rights Reserved. -->
		<!-- This is unreleased proprietary source code of Oracle Corporation -->

		@@ -0,0 +1,8 @@
		docker pull wlsldi-v2.docker.oraclecorp.com/store-weblogic-12.2.1.3:latest

		@@ -0,0 +1 @@
		/target/

Feature/java integration tests #300

Feature/java integration tests #300

Uh oh!

Conversation

vanajamukkara commented May 17, 2018 • edited by rjeberhard Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

moreaut May 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rjeberhard commented May 23, 2018

Uh oh!

Uh oh!

vanajamukkara commented May 17, 2018 •

edited by rjeberhard

Loading

moreaut May 18, 2018 •

edited

Loading