more cleanup

Author: Brendan Doyle

common/scala/src/main/scala/org/apache/openwhisk/core/entity/InstanceConcurrencyLimit.scala

@@ -67,13 +67,13 @@ protected[core] object InstanceConcurrencyLimit extends ArgNormalizer[InstanceCo
     def read(value: JsValue) = {
       Try {
         val JsNumber(c) = value
-        require(c.isWhole, "container concurrency limit must be whole number")
+        require(c.isWhole, "instance concurrency limit must be whole number")
 
         InstanceConcurrencyLimit(c.toInt)
       } match {
         case Success(limit)                       => limit
         case Failure(e: IllegalArgumentException) => deserializationError(e.getMessage, e)
-        case Failure(e: Throwable)                => deserializationError("container concurrency limit malformed", e)
+        case Failure(e: Throwable)                => deserializationError("instance concurrency limit malformed", e)
       }
     }
   }

common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala

@@ -41,7 +41,7 @@ case class ActionLimitsOption(timeout: Option[TimeLimit],
                               memory: Option[MemoryLimit],
                               logs: Option[LogLimit],
                               concurrency: Option[IntraConcurrencyLimit],
-                              containerConcurrency: Option[InstanceConcurrencyLimit] = None)
+                              instances: Option[InstanceConcurrencyLimit] = None)
 
 /**
  * WhiskActionPut is a restricted WhiskAction view that eschews properties

core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala

@@ -456,7 +456,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
         l.memory getOrElse MemoryLimit(),
         l.logs getOrElse LogLimit(),
         l.concurrency getOrElse IntraConcurrencyLimit(),
-        l.containerConcurrency)
+        l.instances)
     } getOrElse ActionLimits()
     // This is temporary while we are making sequencing directly supported in the controller.
     // The parameter override allows this to work with Pipecode.code. Any parameters other
@@ -553,7 +553,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
         l.memory getOrElse action.limits.memory,
         l.logs getOrElse action.limits.logs,
         l.concurrency getOrElse action.limits.concurrency,
-        if (l.containerConcurrency.isDefined) l.containerConcurrency else action.limits.instances)
+        if (l.instances.isDefined) l.instances else action.limits.instances)
     } getOrElse action.limits
 
     // This is temporary while we are making sequencing directly supported in the controller.
@@ -697,7 +697,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
     content.limits
       .map(
         l =>
-          l.containerConcurrency
+          l.instances
             .map(
               m =>
                 if (m.maxConcurrentInstances > namespaceConcurrencyLimit)