Merge pull request #43 from cloudblue/feature/LITE-28074-Abort-Deploy…

…mentRequest LITE-28074: Handling Aborted tasks, and deployment in aborting status.
cloudblue · Jul 24, 2023 · 29b7c48 · 29b7c48
2 parents a46dea7 + a94007b
commit 29b7c48
Show file tree

Hide file tree

Showing 16 changed files with 187 additions and 13,828 deletions.
diff --git a/connect_ext_ppr/models/deployment.py b/connect_ext_ppr/models/deployment.py
@@ -20,7 +20,7 @@ class Deployment(Model):
 
     PREFIX = 'DPL'
 
-    STATUS = DeploymentStatusChoices
+    STATUSES = DeploymentStatusChoices
 
     id = db.Column(db.String(20), primary_key=True)
     product_id = db.Column(db.String, db.ForeignKey(Product.id))
@@ -29,7 +29,7 @@ class Deployment(Model):
     vendor_id = db.Column(db.String(20))
     status = db.Column(
         db.Enum(DeploymentStatusChoices, validate_strings=True),
-        default=STATUS.pending,
+        default=STATUSES.pending,
     )
     last_sync_at = db.Column(db.DateTime(), default=datetime.utcnow)
     created_at = db.Column(db.DateTime(), default=datetime.utcnow)
@@ -43,14 +43,14 @@ class DeploymentRequest(Model):
 
     PREFIX = 'DPLR'
 
-    STATUS = DeploymentRequestStatusChoices
+    STATUSES = DeploymentRequestStatusChoices
 
     id = db.Column(db.String(20), primary_key=True)
     deployment_id = db.Column(db.ForeignKey(Deployment.id))
     ppr_id = db.Column(db.String, db.ForeignKey(PPRVersion.id))
     status = db.Column(
         db.Enum(DeploymentRequestStatusChoices, validate_strings=True),
-        default=STATUS.pending,
+        default=STATUSES.pending,
     )
     manually = db.Column(db.Boolean(), default=False)
     delegate_l2 = db.Column(db.Boolean(), default=False)

diff --git a/connect_ext_ppr/models/enums.py b/connect_ext_ppr/models/enums.py
@@ -25,9 +25,9 @@ class TasksStatusChoices(str, enum.Enum):
 
 
 class TaskTypesChoices(str, enum.Enum):
-    PPR_VALIDATION = 'ppr_validation'
-    APPLY_AND_DELEGATE = 'apply_ppr_and_delegate_to_marketplace'
-    DELEGATE_TO_L2 = 'delegate_to_l2'
+    ppr_validation = 'ppr_validation'
+    apply_and_delegate = 'apply_ppr_and_delegate_to_marketplace'
+    delegate_to_l2 = 'delegate_to_l2'
 
 
 class MimeTypeChoices(str, enum.Enum):

diff --git a/connect_ext_ppr/models/task.py b/connect_ext_ppr/models/task.py
@@ -12,12 +12,12 @@ class Task(Model):
 
     PREFIX = 'TSK'
 
-    STATUS = TasksStatusChoices
+    STATUSES = TasksStatusChoices
 
     id = db.Column(db.String(30), primary_key=True)
     status = db.Column(
         db.Enum(TasksStatusChoices, validate_strings=True),
-        default=STATUS.pending,
+        default=STATUSES.pending,
     )
     deployment_request = db.Column(db.ForeignKey(DeploymentRequest.id))
     title = db.Column(db.String(100))

diff --git a/connect_ext_ppr/static/deployment-details.css b/connect_ext_ppr/static/deployment-details.css