added remove prom,grafana method

Author: marinakog

integration-tests/USECASES.MD

@@ -111,9 +111,7 @@ Configuration Overrides Usecases
 | Append Configuration with varios combinations of attributes via exporter console| Append monitoring exporter configuration [a] to new config [a,b] and verify it was applied |
 | Replace Configuration with only one attribute as array via exporter console| Replace monitoring exporter configuration [a,b,c] attributes with new config [a] and verify it was applied |
 | Replace Configuration with empty config file via exporter console| Replace monitoring exporter configuration with empty config file, verify it was applied |
-| Replace Configuration with not existed config file via exporter console| Try to replace monitoring exporter configuration with not existed config file, verify configuration has not changed |
-| Replace Configuration with empty string for config file param  via exporter console| Try to replace monitoring exporter configuration with empty string for config file param, verify configuration has not changed |
 | Replace/Append Configuration with  config file written in non yml format via exporter console| Try to replace/append monitoring exporter configuration with config file written in non yml format, verify configuration has not changed |
 | Replace/Append Configuration with corrupted yml file via exporter console| Try to replace/append monitoring exporter configuration with config file written in corrupted yml format, verify configuration has not changed |
 | Replace/Append Configuration with dublicated values in the config file via exporter console| Try to replace/append monitoring exporter configuration with dublicated values in the config file, verify configuration has not changed |
-| Replace/Append Configuration with dublicated values in the config file via exporter console| Try to replace/append monitoring exporter configuration with varios combos for invalid credentials, verify configuration has not changed and `401 Unauthorized` exception was thrown |
+| Replace/Append Configuration with invalid credentials via exporter console| Try to replace/append monitoring exporter configuration with varios combos for invalid credentials, verify configuration has not changed and `401 Unauthorized` exception was thrown |

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

@@ -116,9 +116,8 @@ public static void staticUnPrepare() throws Exception {
       if (operator != null) {
         operator.destroy();
       }
-
       tearDown(new Object() {}.getClass().getEnclosingClass().getSimpleName());
-
+      deletePrometheusGrafana();
       logger.info("SUCCESS");
     }
   }
@@ -276,40 +275,6 @@ public void test06_ReplaceWithEmptyConfiguration() throws Exception {
     logger.info("SUCCESS - " + testMethodName);
   }
 
-  /**
-   * Replace monitoring exporter configuration with not existed config file
-   *
-   * @throws Exception
-   */
-  @Test
-  public void test06_1ReplaceWithNotExistedFileConfiguration() throws Exception {
-    Assume.assumeFalse(QUICKTEST);
-    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
-    logTestBegin(testMethodName);
-    boolean testCompletedSuccessfully = false;
-    HtmlPage page = submitConfigureForm(exporterUrl, "replace", "/scratch/m/test.yml");
-    assertTrue(page.asText().contains("queries:") && !page.asText().contains("values"));
-    testCompletedSuccessfully = true;
-    logger.info("SUCCESS - " + testMethodName);
-  }
-
-  /**
-   * Replace monitoring exporter configuration with no file name for configuration
-   *
-   * @throws Exception
-   */
-  @Test
-  public void test06_2ReplaceWithNoFileNameConfiguration() throws Exception {
-    Assume.assumeFalse(QUICKTEST);
-    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
-    logTestBegin(testMethodName);
-    boolean testCompletedSuccessfully = false;
-    HtmlPage page = submitConfigureForm(exporterUrl, "replace", "");
-    assertTrue(page.asText().contains("queries:") && !page.asText().contains("values"));
-    testCompletedSuccessfully = true;
-    logger.info("SUCCESS - " + testMethodName);
-  }
-
   /**
    * Try to append monitoring exporter configuration with empty configuration
    *
@@ -330,46 +295,6 @@ public void test07_AppendWithEmptyConfiguration() throws Exception {
     logger.info("SUCCESS - " + testMethodName);
   }
 
-  /**
-   * Try to append monitoring exporter configuration with not existed configuration file
-   *
-   * @throws Exception
-   */
-  @Test
-  public void test07_1AppendWithNotExistedFileConfiguration() throws Exception {
-    Assume.assumeFalse(QUICKTEST);
-    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
-    logTestBegin(testMethodName);
-    boolean testCompletedSuccessfully = false;
-    final WebClient webClient = new WebClient();
-    HtmlPage originalPage = webClient.getPage(exporterUrl);
-    assertNotNull(originalPage);
-    HtmlPage page = submitConfigureForm(exporterUrl, "append", "/scratch/m/test.yml");
-    assertTrue(originalPage.asText().equals(page.asText()));
-    testCompletedSuccessfully = true;
-    logger.info("SUCCESS - " + testMethodName);
-  }
-
-  /**
-   * Try to append monitoring exporter configuration with null name for configuration file
-   *
-   * @throws Exception
-   */
-  @Test
-  public void test07_2AppendWithNoFileNameConfiguration() throws Exception {
-    Assume.assumeFalse(QUICKTEST);
-    String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
-    logTestBegin(testMethodName);
-    boolean testCompletedSuccessfully = false;
-    final WebClient webClient = new WebClient();
-    HtmlPage originalPage = webClient.getPage(exporterUrl);
-    assertNotNull(originalPage);
-    HtmlPage page = submitConfigureForm(exporterUrl, "append", "");
-    assertTrue(originalPage.asText().equals(page.asText()));
-    testCompletedSuccessfully = true;
-    logger.info("SUCCESS - " + testMethodName);
-  }
-
   /**
    * Try to append monitoring exporter configuration with configuration file not in the yaml format
    *
@@ -682,6 +607,7 @@ private HtmlPage submitConfigureForm(
     // Now submit the form by clicking the button and get back the second page.
     HtmlPage page2 = button.click();
     assertNotNull(page2);
+    assertFalse((page2.asText()).contains("Error 500--Internal Server Error"));
     return page2;
   }
 
@@ -795,6 +721,21 @@ private static void deployMonitoringExporterPrometethusGrafana(
         "wlsexporter", exporterAppPath, BaseTest.getUsername(), BaseTest.getPassword());
   }
 
+  private static void deletePrometheusGrafana() throws Exception {
+
+    String samplesDir = monitoringExporterDir + "/src/samples/kubernetes/";
+
+    String crdCmd = " kubectl delete -f " + samplesDir + "prometheus-deployment.yaml";
+    TestUtils.exec(crdCmd);
+
+    crdCmd = " kubectl delete -f " + samplesDir + "grafana-deployment.yaml";
+    TestUtils.exec(crdCmd);
+
+    crdCmd = " kubectl delete -f " + samplesDir + "monitoring-namespace.yaml";
+    TestUtils.exec(crdCmd);
+    logger.info("Deleted Prometheus and Grafana");
+  }
+
   /**
    * A utility method to add desired domain namespace to coordinator yaml template file replacing
    * the DOMAIN_NS,