Merge pull request #537 from oracle/wldf-fix

Corrections to wldf script

Author: rjeberhard

integration-tests/src/test/java/oracle/kubernetes/operator/ITOperator.java

@@ -288,9 +288,9 @@ private Domain testAllUseCasesForADomain(Operator operator, String domainYamlFil
     logger.info("Creating Domain & verifing the domain creation");
     // create domain1
     Domain domain = testDomainCreation(domainYamlFile);
+    testClusterScaling(operator, domain);
     testDomainLifecyle(operator, domain);
     testOperatorLifecycle(operator, domain);
-    testClusterScaling(operator, domain);
     return domain;
   }
 

integration-tests/src/test/resources/wldf/wldf.py

@@ -3,6 +3,7 @@
 from java.io import File
 import sys, socket
 import os
+import time as systime
 hostname = socket.gethostname()
 
 k8s_master_host=os.environ.get('KUBERNETES_SERVICE_HOST')
@@ -63,4 +64,22 @@
 wh1.addNotification(scriptAct)
 
 save()
-activate()
+activate(block='true')
+
+print "wait for harvester watch to become active"
+
+domainRuntime()
+
+cd('ServerRuntimes/admin-server/WLDFRuntime/WLDFRuntime/WLDFWatchNotificationRuntime/WatchNotification')
+
+numWatchEval=cmo.getTotalHarvesterWatchEvaluations()
+maxwait=300
+
+while(numWatchEval < 1) and (maxwait > 0):
+  print numWatchEval
+  maxwait -= 1
+  systime.sleep(1)
+  numWatchEval=cmo.getTotalHarvesterWatchEvaluations()
+
+print "wldf.py done numWatchEval is ", numWatchEval, " maxwait is ", maxwait
+