API GW end-to-end health test
- create action
- create API with for that action
- invoke API
- validate results
- Add test for unsupported method.
- Fix hardcoded CLI namespace as `guest`; use wskadmin to obtain namespace
- Add debug line to dump cli user id and namespace
diff --git a/tests/src/apigw/healthtests/ApiGwEndToEndTests.scala b/tests/src/apigw/healthtests/ApiGwEndToEndTests.scala
new file mode 100644
index 0000000..d5921fd
--- /dev/null
+++ b/tests/src/apigw/healthtests/ApiGwEndToEndTests.scala
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015-2016 IBM Corporation
+ *
+ * Licensed 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 apigw.healthtests
+
+import org.junit.runner.RunWith
+import org.scalatest.FlatSpec
+import org.scalatest.Matchers
+import org.scalatest.junit.JUnitRunner
+
+import spray.json.DefaultJsonProtocol._
+import spray.json._
+
+import com.jayway.restassured.RestAssured
+
+import common.TestHelpers
+import common.TestUtils
+import common.TestUtils._
+import common.Wsk
+import common.WskAdmin
+import common.WskProps
+import common.WskTestHelpers
+import system.rest.RestUtil
+
+/**
+ * Basic tests of the download link for Go CLI binaries
+ */
+@RunWith(classOf[JUnitRunner])
+class ApiGwEndToEndTests extends FlatSpec with Matchers with RestUtil with TestHelpers with WskTestHelpers{
+
+ implicit val wskprops = WskProps()
+ val wsk = new Wsk
+ val (cliuser, clinamespace) = WskAdmin.getUser(wskprops.authKey)
+
+ it should s"create an API and successfully invoke that API" in {
+ val testName = "APIGW_HEALTHTEST1"
+ val testbasepath = "/"+testName+"_bp"
+ val testrelpath = "/path"
+ val testurlop = "get"
+ val testapiname = testName+" API Name"
+ val actionName = "echo"
+ val urlqueryparam = "name"
+ val urlqueryvalue = "test"
+
+
+ try {
+ println("cli user: "+cliuser+"; cli namespace: "+clinamespace)
+
+ // Create the action for the API
+ val file = TestUtils.getTestActionFilename(s"echo.js")
+ wsk.action.create(name = actionName, artifact = Some(file), expectedExitCode = SUCCESS_EXIT)
+
+ // Create the API
+ var rr = wsk.api.create(basepath = Some(testbasepath), relpath = testrelpath, operation = testurlop, action = actionName, apiname = Some(testapiname))
+ rr.stdout should include("ok: created API")
+ val apiurl = rr.stdout.split("\n")(1)
+ println(s"apiurl: '${apiurl}'")
+
+ // Validate the API was successfully created
+ // List result will look like:
+ // ok: APIs
+ // Action Verb API Name URL
+ // /_//whisk.system/utils/echo get APIGW_HEALTHTEST1 API Name http://172.17.0.1:9001/api/ab9082cd-ea8e-465a-8a65-b491725cc4ef/APIGW_HEALTHTEST1_bp/path
+ rr = wsk.api.list(basepathOrApiName = Some(testbasepath), relpath = Some(testrelpath), operation = Some(testurlop))
+ rr.stdout should include("ok: APIs")
+ rr.stdout should include regex (s"${actionName}\\s+${testurlop}\\s+${testapiname}\\s+")
+ rr.stdout should include(testbasepath + testrelpath)
+
+ // Call the API URL and validate the results
+ val response = RestAssured.given().config(sslconfig).get(s"$apiurl?$urlqueryparam=$urlqueryvalue")
+ response.statusCode should be(200)
+ val responseString = response.body.asString
+ println("URL invocation response: "+responseString)
+ responseString.parseJson.asJsObject.fields(urlqueryparam).convertTo[String] should be(urlqueryvalue)
+ }
+ finally {
+ println("Deleting action: "+actionName)
+ val deleteActionResult = wsk.action.delete(name = actionName, expectedExitCode = DONTCARE_EXIT)
+ println("Deleting API: "+testbasepath)
+ val deleteApiResult = wsk.api.delete(basepathOrApiName = testbasepath, relpath = Some(testrelpath), operation = Some(testurlop), expectedExitCode = DONTCARE_EXIT)
+ }
+ }
+}
diff --git a/tests/src/system/rest/RestUtil.scala b/tests/src/system/rest/RestUtil.scala
index d3505e9..55a125d 100644
--- a/tests/src/system/rest/RestUtil.scala
+++ b/tests/src/system/rest/RestUtil.scala
@@ -30,7 +30,7 @@
/**
* Utilities for REST tests
*/
-protected[rest] trait RestUtil {
+trait RestUtil {
private val trustStorePassword = WhiskProperties.getSslCertificateChallenge
diff --git a/tests/src/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala b/tests/src/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala
index 64856e0..0a5f0b8 100644
--- a/tests/src/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala
+++ b/tests/src/whisk/core/apigw/actions/test/ApiGwRoutemgmtActionTests.scala
@@ -93,7 +93,7 @@
operation: Option[String] = None,
docid: Option[String] = None): Vector[JsValue] = {
val parms = Map[String,JsValue]() ++
- Map("__ow_meta_namespace" -> "guest".toJson) ++
+ Map("__ow_meta_namespace" -> clinamespace.toJson) ++
{ bpOrName map { b => Map("basepath" -> b.toJson) } getOrElse Map[String,JsValue]() } ++
{ relpath map { r => Map("relpath" -> r.toJson) } getOrElse Map[String,JsValue]() } ++
{ operation map { o => Map("operation" -> o.toJson) } getOrElse Map[String,JsValue]() } ++
diff --git a/tests/src/whisk/core/cli/test/ApiGwTests.scala b/tests/src/whisk/core/cli/test/ApiGwTests.scala
index adbbc2d..3d3edf7 100644
--- a/tests/src/whisk/core/cli/test/ApiGwTests.scala
+++ b/tests/src/whisk/core/cli/test/ApiGwTests.scala
@@ -66,6 +66,8 @@
// Action Verb API Name URL
// /_/CLI_APIGWTEST1_action get CLI_APIGWTEST1 API Name http://172.17.0.1:9001/api/ab9082cd-ea8e-465a-8a65-b491725cc4ef/CLI_APIGWTEST1_bp/path
try {
+ println("cli user: "+cliuser+"; cli namespace: "+clinamespace)
+
var rr = wsk.api.create(basepath = Some(testbasepath), relpath = testrelpath, operation = testurlop, action = actionName, apiname = Some(testapiname))
rr.stdout should include("ok: created API")
rr = wsk.api.list(basepathOrApiName = Some(testbasepath), relpath = Some(testrelpath), operation = Some(testurlop))
diff --git a/tests/src/whisk/core/controller/test/MetaApiTests.scala b/tests/src/whisk/core/controller/test/MetaApiTests.scala
index fde7146..3610cf0 100644
--- a/tests/src/whisk/core/controller/test/MetaApiTests.scala
+++ b/tests/src/whisk/core/controller/test/MetaApiTests.scala
@@ -201,6 +201,18 @@
}
}
+ it should "reject unsupported http verbs" in {
+ implicit val tid = transid()
+
+ val methods = Seq((Put, MethodNotAllowed))
+ methods.map {
+ case (m, code) =>
+ m("/experimental/partialmeta") ~> sealRoute(routes(creds)) ~> check {
+ status should be(code)
+ }
+ }
+ }
+
it should "reject access to unknown package or missing package action" in {
implicit val tid = transid()
val methods = Seq(Get, Post, Delete)
