Fix rebase errors

Author: jiangpengcheng

common/scala/src/main/scala/org/apache/openwhisk/core/WarmUp.scala

@@ -41,6 +41,7 @@ object WarmUp {
       revision = DocRevision.empty,
       user = warmUpActionIdentity,
       activationId = new ActivationIdGenerator {}.make(),
+      DocId(warmUpAction.asString),
       rootControllerIndex = controller,
       blocking = false,
       content = None,
@@ -54,6 +55,7 @@ object WarmUp {
         val metadata = WhiskActionMetaData(
           warmUpAction.path,
           warmUpAction.name,
+          DocId(warmUpAction.asString),
           CodeExecMetaDataAsString(manifest, false, entryPoint = None))
         ContainerCreationMessage(
           TransactionId.warmUp,

tests/src/test/scala/org/apache/openwhisk/core/invoker/test/ContainerMessageConsumerTests.scala

@@ -157,6 +157,7 @@ class ContainerMessageConsumerTests
         sendAckToScheduler(producer))
 
     val exec = CodeExecAsString(RuntimeManifest("nodejs:10", ImageName("testImage")), "testCode", None)
+    val docId = DocId("testns/[email protected]")
     val action =
       WhiskAction(EntityPath("testns"), EntityName("testAction"), exec, limits = ActionLimits(TimeLimit(1.minute)))
     put(entityStore, action)
@@ -166,6 +167,7 @@ class ContainerMessageConsumerTests
       WhiskActionMetaData(
         action.namespace,
         action.name,
+        docId,
         execMetadata,
         action.parameters,
         action.limits,
@@ -212,6 +214,7 @@ class ContainerMessageConsumerTests
         sendAckToScheduler(ackConsumer.getProducer()))
 
     val exec = CodeExecAsString(RuntimeManifest("nodejs:10", ImageName("testImage")), "testCode", None)
+    val docId = DocId("testns/[email protected]")
     val whiskAction =
       WhiskAction(EntityPath("testns"), EntityName("testAction2"), exec, limits = ActionLimits(TimeLimit(1.minute)))
     val execMetadata =
@@ -220,6 +223,7 @@ class ContainerMessageConsumerTests
       WhiskActionMetaData(
         whiskAction.namespace,
         whiskAction.name,
+        docId,
         execMetadata,
         whiskAction.parameters,
         whiskAction.limits,
@@ -294,14 +298,15 @@ class ContainerMessageConsumerTests
         WarmUp.warmUpAction.name,
         exec,
         limits = ActionLimits(TimeLimit(1.minute)))
-    val doc = put(entityStore, action)
+    val docId = DocId(action.fullyQualifiedName(true).asString)
     val execMetadata =
       CodeExecMetaDataAsString(exec.manifest, entryPoint = exec.entryPoint)
 
     val actionMetadata =
       WhiskActionMetaData(
         action.namespace,
         action.name,
+        docId,
         execMetadata,
         action.parameters,
         action.limits,

tests/src/test/scala/org/apache/openwhisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala

@@ -39,6 +39,7 @@ import scala.concurrent.Future
 import scala.concurrent.duration._
 import org.apache.openwhisk.common.Logging
 import org.apache.openwhisk.common.NestedSemaphore
+import org.apache.openwhisk.common.InvokerHealth
 import org.apache.openwhisk.core.entity._
 import org.apache.openwhisk.common.TransactionId
 import org.apache.openwhisk.core.WhiskConfig

tests/src/test/scala/org/apache/openwhisk/core/scheduler/container/test/ContainerManagerTests.scala

@@ -91,12 +91,14 @@ class ContainerManagerTests
   val resourcesStrictPolicy = false
 
   val exec = CodeExecAsString(RuntimeManifest("actionKind", ImageName("testImage")), "testCode", None)
-  val action = ExecutableWhiskAction(EntityPath(testNamespace), EntityName(testAction), exec)
+  val docId = DocId(s"$testNamespace/$testAction@0.0.1")
+  val action = ExecutableWhiskAction(EntityPath(testNamespace), EntityName(testAction), docId, exec)
   val execMetadata = CodeExecMetaDataAsString(exec.manifest, entryPoint = exec.entryPoint)
   val actionMetadata =
     WhiskActionMetaData(
       action.namespace,
       action.name,
+      docId,
       execMetadata,
       action.parameters,
       action.limits,
@@ -776,12 +778,14 @@ class ContainerManagerTests
         ContainerManager.props(factory(mockJobManager), mockMessaging(), testsid, mockEtcd, config, mockWatcher.ref))
 
     val exec = BlackBoxExec(ExecManifest.ImageName("image"), None, None, native = false, binary = false)
-    val action = ExecutableWhiskAction(EntityPath(testNamespace), EntityName(testAction), exec)
+    val docId = DocId(s"$testNamespace/$testAction@0.0.1")
+    val action = ExecutableWhiskAction(EntityPath(testNamespace), EntityName(testAction), docId, exec)
     val execMetadata = BlackBoxExecMetaData(exec.image, exec.entryPoint, exec.native, exec.binary)
     val actionMetadata =
       WhiskActionMetaData(
         action.namespace,
         action.name,
+        docId,
         execMetadata,
         action.parameters,
         action.limits,