From 01f8291bb77f605d8c495e814e70f6fe161b154e Mon Sep 17 00:00:00 2001
From: Yogi_Wang <yawang@vmware.com>
Date: Wed, 1 Apr 2020 22:47:43 +0800
Subject: [PATCH] [Nightly] Project Level Image Serverity Policy Signed-off-by:
 Yogi_Wang <yawang@vmware.com>

---
 .../artifact-tag/artifact-tag.component.html  |  2 +-
 src/portal/src/i18n/lang/en-us-lang.json      |  3 ++-
 src/portal/src/i18n/lang/es-es-lang.json      |  3 ++-
 src/portal/src/i18n/lang/fr-fr-lang.json      |  3 ++-
 src/portal/src/i18n/lang/pt-br-lang.json      |  3 ++-
 src/portal/src/i18n/lang/tr-tr-lang.json      |  3 ++-
 src/portal/src/i18n/lang/zh-cn-lang.json      |  3 ++-
 tests/robot-cases/Group1-Nightly/Trivy.robot  | 20 +++++++++++++++++++
 8 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html b/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html
index 8a1eb2b6c..6e2ed2198 100644
--- a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html
+++ b/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html
@@ -19,7 +19,7 @@
                         <input clrInput type="text" id="name" name="name" required size="20" autocomplete="off"
                             [(ngModel)]="newTagName.name" #name="ngModel" pattern="^[\w][\w.-]{0,127}$" (keyup)="existValid(newTagName.name)">
                         <clr-control-error class="position-ab" *ngIf="isTagNameExist">
-                            {{'LABEL.NAME_ALREADY_EXISTS' | translate }}
+                            {{'TAG.NAME_ALREADY_EXISTS' | translate }}
                         </clr-control-error>
                         <clr-control-error class="position-ab" *ngIf="name.hasError('pattern')">
                             {{'RETAG.TIP_TAG' | translate }}
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index dc74afe4d..46eceb7e4 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -1064,7 +1064,8 @@
         "OF": "of",
         "ITEMS": "items",
         "ADD_TAG": "ADD TAG",
-        "REMOVE_TAG": "REMOVE TAG"
+        "REMOVE_TAG": "REMOVE TAG",
+        "NAME_ALREADY_EXISTS": "Tag already exists under the repository"
     },
     "LABEL": {
         "LABEL": "Label",
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index 9341a367e..ac4d472e3 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -1063,7 +1063,8 @@
         "PUSH_TIME": "Push Time",
         "OF": "of",
         "ADD_TAG": "ADD TAG",
-        "REMOVE_TAG": "REMOVE TAG"
+        "REMOVE_TAG": "REMOVE TAG",
+        "NAME_ALREADY_EXISTS": "Tag already exists under the repository"
 
     },
     "LABEL": {
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index e6295d17b..a2dbdac9d 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -1035,7 +1035,8 @@
         "OF": "of",
         "ITEMS": "items",
         "ADD_TAG": "ADD TAG",
-        "REMOVE_TAG": "REMOVE TAG"
+        "REMOVE_TAG": "REMOVE TAG",
+        "NAME_ALREADY_EXISTS": "Tag already exists under the repository"
     },
     "LABEL": {
         "LABEL": "Label",
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index 7b11e2969..8fe8b9857 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -1056,7 +1056,8 @@
         "OF": "of",
         "ITEMS": "items",
         "ADD_TAG": "ADD TAG",
-        "REMOVE_TAG": "REMOVE TAG"
+        "REMOVE_TAG": "REMOVE TAG",
+        "NAME_ALREADY_EXISTS": "Tag already exists under the repository"
     },
     "LABEL": {
         "LABEL": "Label",
diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
index 0854eb291..ad90404e0 100644
--- a/src/portal/src/i18n/lang/tr-tr-lang.json
+++ b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -1064,7 +1064,8 @@
         "OF": "of",
         "ITEMS": "items",
         "ADD_TAG": "ADD TAG",
-        "REMOVE_TAG": "REMOVE TAG"
+        "REMOVE_TAG": "REMOVE TAG",
+        "NAME_ALREADY_EXISTS": "Tag already exists under the repository"
     },
     "LABEL": {
         "LABEL": "Etiket",
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
index 10740ad01..d455ff2b3 100644
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -1063,7 +1063,8 @@
         "OF": "共计",
         "ITEMS": "条记录",
         "ADD_TAG": "添加 TAG",
-        "REMOVE_TAG": "删除 TAG"
+        "REMOVE_TAG": "删除 TAG",
+        "NAME_ALREADY_EXISTS": "当前的镜像已经存在此名字的Tag"
     },
     "LABEL": {
         "LABEL": "标签",
diff --git a/tests/robot-cases/Group1-Nightly/Trivy.robot b/tests/robot-cases/Group1-Nightly/Trivy.robot
index a24699f5e..a070a3a4d 100644
--- a/tests/robot-cases/Group1-Nightly/Trivy.robot
+++ b/tests/robot-cases/Group1-Nightly/Trivy.robot
@@ -124,3 +124,23 @@ Test Case - View Scan Results
     Summary Chart Should Display  latest
     View Repo Scan Details
     Close Browser 
+Test Case - Project Level Image Serverity Policy
+    [Tags]  run-once
+    Init Chrome Driver
+    Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
+    ${d}=  get current date  result_format=%m%s
+    #For docker-hub registry
+    #${sha256}=  Set Variable  9755880356c4ced4ff7745bafe620f0b63dd17747caedba72504ef7bac882089
+    #For internal CPE harbor registry
+    ${sha256}=  Set Variable  0e67625224c1da47cb3270e7a861a83e332f708d3d89dde0cbed432c94824d9a
+    ${image}=  Set Variable  redis
+    Create An New Project  project${d}
+    Push Image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  project${d}  ${image}  sha256=${sha256}
+    Go Into Project  project${d}
+    Go Into Repo  ${image}
+    Scan Repo  ${sha256}  Succeed
+    Navigate To Projects
+    Go Into Project  project${d}
+    Set Vulnerabilty Serverity  3
+    Cannot pull image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  project${d}  ${image}  tag=${sha256}
+    Close Browser
\ No newline at end of file