CSVS-54 English was fixed #81

MedvedevBW · 2017-10-17T05:49:21Z

No description provided.

…o CSVS-54 # Conflicts: # src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackTaskCreator.scala

coveralls · 2017-10-17T05:54:03Z

Coverage increased (+0.03%) to 82.643% when pulling 249fd18 on CSVS-54 into fbabd40 on develop.

mistake

placccebo · 2017-10-17T09:10:56Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/CloudStackService.scala

@@ -30,18 +30,18 @@ import org.slf4j.LoggerFactory
 /**
  * Class is responsible for interaction with CloudStack server with help of CloudStackTaskCreator
  *
-  * @param cloudStackTaskCreator allows for creating task for interaction with CloudStack
-  * @param settings contains the settings for interaction with CloudStack
+  * @param cloudStackTaskCreator enables creation tasks for interaction with CloudStack


enables the creation of tasks?

coveralls · 2017-10-18T11:14:24Z

Coverage increased (+0.03%) to 82.643% when pulling f4eac5e on CSVS-54 into fbabd40 on develop.

coveralls · 2017-10-19T05:12:12Z

Coverage increased (+0.03%) to 82.643% when pulling d9af398 on CSVS-54 into fbabd40 on develop.

placccebo · 2017-10-19T06:40:46Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/CloudStackService.scala

@@ -120,20 +120,20 @@ class CloudStackService(cloudStackTaskCreator: CloudStackTaskCreator,
                cloudStackTaskCreator.domainParameter -> vm.domainId.toString
              ))
    ).accountList.accounts.getOrElse(
-      throw new CloudStackEntityDoesNotExistException(s"The vm: $vmId does not include account with " +
+      throw new CloudStackEntityDoesNotExistException(s"Vm: $vmId does not include an account with " +


Vm: $vmId does not include the account with "

placccebo · 2017-10-19T06:51:40Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackEventHandler.scala

@@ -51,10 +51,10 @@ class CloudStackEventHandler(controller: CloudStackVaultController)
      } match {
        case Success(x) => x
        case Failure(e: JsonParseException) =>
-          logger.warn("Can not to parse record json, the empty CloudStackEvent will be return")
+          logger.warn("Can not to parse record: \"" + s"$record" + "\", the empty CloudStackEvent is returned")


logger.warn("Can not parse the record: "" + s"$record" + "", the empty CloudStackEvent will be returned")

placccebo · 2017-10-19T06:54:47Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackEventHandler.scala

          CloudStackEvent(None, None, None)
        case Failure(e: Throwable) =>
-          logger.error("Exception was thrown while record was being deserialized")
+          logger.error("The process of record: \"" + s"$record" + "\"" + s"deserializing thrown an exception: $e")


logger.error("Deserialization process of record: "" + s"$record" + """ + s" threw an exception: $e")
or
logger.error("Exception: $e occurred during the deserialization of the record: "" + s"$record" + """ ")

placccebo · 2017-10-19T06:58:43Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackEventHandler.scala

-            event.status.getOrElse(Other) == CloudStackEvent.Status.Completed                              //Event must be handle when status of event Completed
-          case _ =>                                                                                        //but first event have a signature such as {"details":"...","status":"Completed","event":"..."}
-            false                                                                                          //and don't have an entityuuid, so we must to check entityuuid.
+            event.status.getOrElse(Other) == CloudStackEvent.Status.Completed                              //Event must be handled when status of event is Completed.


move this comment to method description

placccebo · 2017-10-19T07:00:05Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackEventHandler.scala

-            false                                                                                          //and don't have an entityuuid, so we must to check entityuuid.
+            event.status.getOrElse(Other) == CloudStackEvent.Status.Completed                              //Event must be handled when status of event is Completed.
+          case _ =>                                                                                        //The first event has a signature such as {"details":"...","status":"Completed","event":"..."},
+            false                                                                                          //which doesn’t contain an entityuuid field, so we must to check entityuuid.


so we must check entityuuid.

placccebo · 2017-10-19T08:33:15Z

.../scala/com/bwsw/cloudstack/vault/server/controllers/CloudStackVaultControllerTestSuite.scala

@@ -93,7 +111,7 @@ class CloudStackVaultControllerTestSuite extends FlatSpec with BaseTestSuite wit
  }


-  "handleAccountDelete" should "delete secret by default path if node with token does not exist" in {
+  "handleAccountDelete" should "delete secret if account node does not exist" in {


"handleAccountDelete" should "delete secret if account znode does not exist"

placccebo · 2017-10-19T08:33:34Z

.../scala/com/bwsw/cloudstack/vault/server/controllers/CloudStackVaultControllerTestSuite.scala

@@ -119,7 +137,7 @@ class CloudStackVaultControllerTestSuite extends FlatSpec with BaseTestSuite wit
    assert(pathsForCheckIsExistNode == checkedIsExistNodePaths, "checkedIsExistNodePaths is wrong")
  }

-  "handleVmDelete" should "get token from Zookeeper node, revoke it and delete secret by path in token information" in {
+  "handleVmDelete" should "get tokens from Zookeeper nodes, revoke them and then delete secret and policies" in {


"handleVmDelete" should "get VM tokens from ZooKeeper, revoke them and then delete secret and policies" in

placccebo · 2017-10-19T08:35:32Z

.../scala/com/bwsw/cloudstack/vault/server/controllers/CloudStackVaultControllerTestSuite.scala

@@ -156,7 +174,7 @@ class CloudStackVaultControllerTestSuite extends FlatSpec with BaseTestSuite wit
    assert(pathForCheckDeletionNode == checkedDeletionNodePaths, "checkedDeletionNodePaths is wrong")
  }

-  "handleVmDelete" should "delete secret by default path if node with token does not exist" in {
+  "handleVmDelete" should "delete secret if VM node does not exist" in {


placccebo · 2017-10-19T08:38:41Z

.../scala/com/bwsw/cloudstack/vault/server/controllers/CloudStackVaultControllerTestSuite.scala

@@ -187,7 +205,7 @@ class CloudStackVaultControllerTestSuite extends FlatSpec with BaseTestSuite wit
  //*           User Creation           *
  //*                                   *
  //*************************************
-  "handleUserCreate" should "creates new tokens (read, write) and put it into zooKeeper nodes and cloudStack user tags" in {
+  "handleUserCreate" should "create new tokens (read, write) and put them into zooKeeper nodes and cloudStack user tags" in {


placccebo · 2017-10-19T08:55:58Z

.../scala/com/bwsw/cloudstack/vault/server/controllers/CloudStackVaultControllerTestSuite.scala

@@ -228,7 +246,7 @@ class CloudStackVaultControllerTestSuite extends FlatSpec with BaseTestSuite wit
    assert(checkedNewTags.toSet == expectedVaultTagsForAccount.toSet)
  }

-  "handleUserCreate" should "gets tokens (read, write) from zooKeeper nodes and write it into cloudStack user tags" in {
+  "handleUserCreate" should "get tokens (read, write) from zooKeeper nodes and put them into cloudStack user tags" in {


"handleUserCreate" should "get account tokens (read, write) from ZooKeeper and put them into CloudStack user tags"

…o CSVS-54 # Conflicts: # README.md # src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackTaskCreator.scala # src/test/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackTaskCreatorTestSuite.scala

coveralls · 2017-10-19T10:31:49Z

Coverage increased (+0.03%) to 82.683% when pulling e26d8f4 on CSVS-54 into f87904a on develop.

coveralls · 2017-10-19T10:58:44Z

Coverage increased (+0.03%) to 82.683% when pulling 5d64828 on CSVS-54 into f87904a on develop.

placccebo · 2017-10-20T01:54:34Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackEventHandler.scala

@@ -51,10 +51,10 @@ class CloudStackEventHandler(controller: CloudStackVaultController)
      } match {
        case Success(x) => x
        case Failure(e: JsonParseException) =>
-          logger.warn("Can not to parse record: \"" + s"$record" + "\", the empty CloudStackEvent is returned")
+          logger.warn("Can not to parse the record: \"" + s"$record" + "\", the empty CloudStackEvent will be returned")


there is still a mistake, see the previous review

"to" was removed

placccebo · 2017-10-20T01:55:12Z

src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackEventHandler.scala

+    /**
+      * Event must be handled when status of event is Completed.
+      * The first event has a signature such as {"details":"...","status":"Completed","event":"..."},
+      * which does not contain an entityuuid field, so we must check entityuuid.


must -> have to

is in both case?

coveralls · 2017-10-20T08:30:03Z

Coverage increased (+0.03%) to 82.683% when pulling 66e7550 on CSVS-54 into f87904a on develop.

coveralls · 2017-10-20T08:48:28Z

Coverage increased (+0.03%) to 82.683% when pulling df59cea on CSVS-54 into f87904a on develop.

MedvedevBW added 7 commits October 16, 2017 12:34

CSVS-54 Comments in CloudStackTaskCreator were fixed

0929bc9

Merge branch 'develop' of https://github.com/bwsw/cs-vault-server int…

1a1f4c0

…o CSVS-54 # Conflicts: # src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackTaskCreator.scala

CSVS-54 After merge fix

b7efabd

Merge branch 'develop' of https://github.com/bwsw/cs-vault-server int…

8f5d39a

…o CSVS-54 # Conflicts: # src/main/scala/com/bwsw/cloudstack/vault/server/cloudstack/util/CloudStackTaskCreator.scala

CSVS-54 Comments were changed in cloudStack service

a396560

CSVS-54 Comments were changed in vault service

249fd18

CSVS-54 Comments in ZooKeeperService was fixed

d4bd1dd

MedvedevBW requested a review from Krisilda October 17, 2017 05:49

placccebo previously approved these changes Oct 17, 2017

View reviewed changes

placccebo requested changes Oct 17, 2017

View reviewed changes

CSVS-54 English was fixed in cloudstack package

f4eac5e

CSVS-54 English was fixed in remaining packages

d9af398

CSVS-54 Remarks were fixed

f510b66

placccebo requested changes Oct 19, 2017

View reviewed changes

MedvedevBW added 2 commits October 19, 2017 17:21

CSVS-54 Remarks were fixed

4a6b4c8

CSVS-54 Remarks described in the document was fixed

5d64828

placccebo requested changes Oct 20, 2017

View reviewed changes

CSVS-54 New remarks described in the document was fixed

df59cea

MedvedevBW force-pushed the CSVS-54 branch from 66e7550 to df59cea Compare October 20, 2017 08:44

placccebo approved these changes Oct 20, 2017

View reviewed changes

MedvedevBW merged commit 5cb6b08 into develop Oct 20, 2017

MedvedevBW deleted the CSVS-54 branch October 20, 2017 08:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CSVS-54 English was fixed #81

CSVS-54 English was fixed #81

MedvedevBW commented Oct 17, 2017

coveralls commented Oct 17, 2017

placccebo Oct 17, 2017

MedvedevBW Oct 19, 2017

coveralls commented Oct 18, 2017

coveralls commented Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

placccebo Oct 19, 2017

MedvedevBW Oct 19, 2017

coveralls commented Oct 19, 2017

coveralls commented Oct 19, 2017

placccebo Oct 20, 2017

MedvedevBW Oct 20, 2017

placccebo Oct 20, 2017

MedvedevBW Oct 20, 2017

MedvedevBW Oct 20, 2017

coveralls commented Oct 20, 2017

coveralls commented Oct 20, 2017

CSVS-54 English was fixed #81

CSVS-54 English was fixed #81

Conversation

MedvedevBW commented Oct 17, 2017

coveralls commented Oct 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Oct 18, 2017

coveralls commented Oct 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Oct 19, 2017

coveralls commented Oct 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

coveralls commented Oct 20, 2017

coveralls commented Oct 20, 2017