Merge branch '10-add-new-stage-types' into 'master'

Resolve "Add new stage types"

Closes #10

See merge request kypo-crp/frontend-angular/models/kypo-sandbox-model!9

projects/kypo-sandbox-model/package.json

 {
   "name": "kypo-sandbox-model",
-  "version": "10.0.0",
+  "version": "10.1.0-dev2",
   "peerDependencies": {
     "@angular/common": "^10.0.0",
     "@angular/core": "^10.0.0",

projects/kypo-sandbox-model/src/lib/enums/request-stage-type.enum.ts

 export enum RequestStageType {
-  OPENSTACK_ALLOCATION,
-  ANSIBLE_ALLOCATION,
-  OPENSTACK_CLEANUP,
-  ANSIBLE_CLEANUP,
+  OPEN_STACK_ALLOCATION,
+  NETWORKING_ANSIBLE_ALLOCATION,
+  USER_ANSIBLE_ALLOCATION,
+  OPEN_STACK_CLEANUP,
+  NETWORKING_ANSIBLE_CLEANUP,
+  USER_ANSIBLE_CLEANUP,
 }

projects/kypo-sandbox-model/src/lib/pool-request/stage/networking-ansible-allocation-stage.ts

+import { KypoPaginatedResource } from 'kypo-common';
+import { RequestStageType } from '../../enums/request-stage-type.enum';
+import { AllocationRequestStage } from './allocation-request-stage';
+
+/**
+ * Class representing ansible stage
+ */
+export class NetworkingAnsibleAllocationStage extends AllocationRequestStage {
+  repoUrl: string;
+  rev: string;
+
+  constructor() {
+    super(RequestStageType.NETWORKING_ANSIBLE_ALLOCATION);
+  }
+}

projects/kypo-sandbox-model/src/lib/pool-request/stage/networking-ansible-cleanup-stage.ts

+import { RequestStageType } from '../../enums/request-stage-type.enum';
+import { CleanupRequestStage } from './cleanup-request-stage';
+
+export class NetworkingAnsibleCleanupStage extends CleanupRequestStage {
+  allocationStageId: number;
+
+  constructor() {
+    super(RequestStageType.NETWORKING_ANSIBLE_CLEANUP);
+  }
+}

projects/kypo-sandbox-model/src/lib/pool-request/stage/open-stack-allocation-stage.ts

@@ -9,6 +9,6 @@ export class OpenStackAllocationStage extends AllocationRequestStage {
   statusReason: string;
 
   constructor() {
-    super(RequestStageType.OPENSTACK_ALLOCATION);
+    super(RequestStageType.OPEN_STACK_ALLOCATION);
   }
 }

projects/kypo-sandbox-model/src/lib/pool-request/stage/open-stack-cleanup-stage.ts

@@ -5,6 +5,6 @@ export class OpenStackCleanupStage extends CleanupRequestStage {
   allocationStageId: number;
 
   constructor() {
-    super(RequestStageType.OPENSTACK_CLEANUP);
+    super(RequestStageType.OPEN_STACK_CLEANUP);
   }
 }

projects/kypo-sandbox-model/src/lib/pool-request/stage/openstack-event.ts → projects/kypo-sandbox-model/src/lib/pool-request/stage/open-stack-event.ts

-export class OpenstackEvent {
+export class OpenStackEvent {
   time: string;
   name: string;
   status: string;

projects/kypo-sandbox-model/src/lib/pool-request/stage/openstack-resource.ts → projects/kypo-sandbox-model/src/lib/pool-request/stage/open-stack-resource.ts

@@ -2,7 +2,7 @@
  * Class representing sandbox instance resource
  */
 
-export class OpenstackResource {
+export class OpenStackResource {
   name: string;
   type: string;
   status: string;

projects/kypo-sandbox-model/src/lib/pool-request/stage/ansible-allocation-stage.ts → projects/kypo-sandbox-model/src/lib/pool-request/stage/user-ansible-allocation-stage.ts

@@ -5,11 +5,11 @@ import { AllocationRequestStage } from './allocation-request-stage';
 /**
  * Class representing ansible stage
  */
-export class AnsibleAllocationStage extends AllocationRequestStage {
+export class UserAnsibleAllocationStage extends AllocationRequestStage {
   repoUrl: string;
   rev: string;
 
   constructor() {
-    super(RequestStageType.ANSIBLE_ALLOCATION);
+    super(RequestStageType.USER_ANSIBLE_ALLOCATION);
   }
 }

projects/kypo-sandbox-model/src/lib/pool-request/stage/ansible-cleanup-stage.ts → projects/kypo-sandbox-model/src/lib/pool-request/stage/user-ansible-cleanup-stage.ts

 import { RequestStageType } from '../../enums/request-stage-type.enum';
 import { CleanupRequestStage } from './cleanup-request-stage';
 
-export class AnsibleCleanupStage extends CleanupRequestStage {
+export class UserAnsibleCleanupStage extends CleanupRequestStage {
   allocationStageId: number;
 
   constructor() {
-    super(RequestStageType.ANSIBLE_CLEANUP);
+    super(RequestStageType.USER_ANSIBLE_CLEANUP);
   }
 }

projects/kypo-sandbox-model/src/public-api.ts

@@ -19,13 +19,15 @@ export { CleanupRequest } from './lib/pool-request/cleanup-request';
 
 // POOL REQUEST STAGES
 export { AllocationRequestStage } from './lib/pool-request/stage/allocation-request-stage';
-export { AnsibleAllocationStage } from './lib/pool-request/stage/ansible-allocation-stage';
-export { AnsibleCleanupStage } from './lib/pool-request/stage/ansible-cleanup-stage';
+export { NetworkingAnsibleAllocationStage } from './lib/pool-request/stage/networking-ansible-allocation-stage';
+export { NetworkingAnsibleCleanupStage } from './lib/pool-request/stage/networking-ansible-cleanup-stage';
+export { UserAnsibleAllocationStage } from './lib/pool-request/stage/user-ansible-allocation-stage';
+export { UserAnsibleCleanupStage } from './lib/pool-request/stage/user-ansible-cleanup-stage';
 export { CleanupRequestStage } from './lib/pool-request/stage/cleanup-request-stage';
 export { OpenStackAllocationStage } from './lib/pool-request/stage/open-stack-allocation-stage';
 export { OpenStackCleanupStage } from './lib/pool-request/stage/open-stack-cleanup-stage';
-export { OpenstackEvent } from './lib/pool-request/stage/openstack-event';
-export { OpenstackResource } from './lib/pool-request/stage/openstack-resource';
+export { OpenStackEvent } from './lib/pool-request/stage/open-stack-event';
+export { OpenStackResource } from './lib/pool-request/stage/open-stack-resource';
 export { RequestStage } from './lib/pool-request/stage/request-stage';
 
 // SANDBOX INSTANCE