diff options
Diffstat (limited to 'vid-automation/src/main/java/vid/automation/test/model')
5 files changed, 26 insertions, 27 deletions
diff --git a/vid-automation/src/main/java/vid/automation/test/model/Credentials.java b/vid-automation/src/main/java/vid/automation/test/model/Credentials.java index 0dc26aefd..46d44b296 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/Credentials.java +++ b/vid-automation/src/main/java/vid/automation/test/model/Credentials.java @@ -1,8 +1,5 @@ package vid.automation.test.model; -/** - * Created by itzikliderman on 26/06/2017. - */ public class Credentials { public String userId; public String password; diff --git a/vid-automation/src/main/java/vid/automation/test/model/JobBulk.java b/vid-automation/src/main/java/vid/automation/test/model/JobBulk.java deleted file mode 100644 index 80d4109a6..000000000 --- a/vid-automation/src/main/java/vid/automation/test/model/JobBulk.java +++ /dev/null @@ -1,23 +0,0 @@ -package vid.automation.test.model; - -import java.util.List; - -public class JobBulk { - - private List<JobModel> jobs; - - public JobBulk() { - } - - public JobBulk(List<JobModel> jobs) { - this.jobs = jobs; - } - - public List<JobModel> getJobs() { - return jobs; - } - - public void setJobs(List<JobModel> jobs) { - this.jobs = jobs; - } -} diff --git a/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java b/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java index 0e92a1f35..a51336ec6 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java +++ b/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java @@ -2,9 +2,11 @@ package vid.automation.test.model; public enum JobStatus { COMPLETED, + COMPLETED_WITH_NO_ACTION, FAILED, IN_PROGRESS, PAUSE, PENDING, - STOPPED; + STOPPED, + COMPLETED_WITH_ERRORS; } diff --git a/vid-automation/src/main/java/vid/automation/test/model/Service.java b/vid-automation/src/main/java/vid/automation/test/model/Service.java index 4ed51eeb1..4aa4a7f9e 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/Service.java +++ b/vid-automation/src/main/java/vid/automation/test/model/Service.java @@ -1,5 +1,7 @@ package vid.automation.test.model; +import com.google.common.base.MoreObjects; + /** * Created by itzikliderman on 19/06/2017. */ @@ -33,4 +35,18 @@ public class Service { this.description = description; this.serviceRole = serviceRole; } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("type", type) + .add("uuid", uuid) + .add("invariantUuid", invariantUuid) + .add("name", name) + .add("version", version) + .add("category", category) + .add("description", description) + .add("serviceRole", serviceRole) + .toString(); + } } diff --git a/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java b/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java new file mode 100644 index 000000000..a155c6c72 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java @@ -0,0 +1,7 @@ +package vid.automation.test.model; + +public enum ServiceAction { + INSTANTIATE, + DELETE, + UPDATE +}
\ No newline at end of file |