From 00a07d81ac66e63247be79596f43e0363586ce9e Mon Sep 17 00:00:00 2001
From: Abbas Ahmad <abbas.ahmad@eglobalmark.com>
Date: Fri, 28 Jun 2019 16:43:04 +0200
Subject: [PATCH] Sol005 High level Code
---
.../CancelOperationTask.robot | 4 ++--
.../ContinueOperationTask.robot | 4 ++--
.../CreateNSInstanceWorkflow.robot | 2 +-
.../DeleteNSInstanceWorkflow.robot | 2 +-
.../FailOperationTask.robot | 4 ++--
SOL005/NSLifecycleManagement-API/HealNSTask.robot | 2 +-
.../IndividualNSInstance.robot | 4 ++--
.../IndividualNSLCMOccurences.robot | 2 +-
.../IndividualSubscription.robot | 2 +-
.../InstantiateNSTask.robot | 3 +--
SOL005/NSLifecycleManagement-API/NSInstances.robot | 12 ++++--------
.../NSLifecycleManagement-API/NSLCMOccurences.robot | 7 +++----
.../NSLCMOperationKeywords.robot | 3 ++-
.../RetryOperationTask.robot | 4 ++--
.../RollbackOperationTask.robot | 4 ++--
SOL005/NSLifecycleManagement-API/ScaleNSTask.robot | 3 +--
SOL005/NSLifecycleManagement-API/Subscriptions.robot | 11 ++++-------
.../NSLifecycleManagement-API/TerminateNSTask.robot | 3 +--
SOL005/NSLifecycleManagement-API/UpdateNSTask.robot | 3 +--
19 files changed, 34 insertions(+), 45 deletions(-)
diff --git a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
index 55611f29..43a4c7ec 100644
--- a/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/CancelOperationTask.robot
@@ -17,13 +17,13 @@ Post Cancel operation task Not Found
[Setup] Check Cancel not supported
POST Cancel operation task
Check HTTP Response Status Code Is 404
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
Post Cancel operation task Conflict
Depends on test failure Check resource FAILED_TEMP
POST Cancel operation task
Check HTTP Response Status Code Is 409
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
PUT Cancel operation task - Method not implemented
PUT Cancel operation task
diff --git a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
index 982f1516..6734bf07 100644
--- a/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ContinueOperationTask.robot
@@ -17,13 +17,13 @@ Post Continue operation task Not Found
[Setup] Check Continue not supported
POST Continue operation task
Check HTTP Response Status Code Is 404
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
Post Continue operation task Conflict
Depends on test failure Check resource FAILED_TEMP
POST Continue operation task
Check HTTP Response Status Code Is 409
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
PUT Continue operation task - Method not implemented
PUT Continue operation task
diff --git a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
index 3ab66349..38139f5b 100644
--- a/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/CreateNSInstanceWorkflow.robot
@@ -12,7 +12,7 @@ NS Instance Creation
POST New nsInstance
Check HTTP Response Status Code Is 201
Check HTTP Response Header Contains Location
- Check HTTP Response Body Json Schema Is NsIdentifierCreationNotification.schema.json
+ Check HTTP Response Body Json Schema Is NsIdentifierCreationNotification
Check resource not_instantiated
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
index df8672d1..5ef3856c 100644
--- a/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
+++ b/SOL005/NSLifecycleManagement-API/DeleteNSInstanceWorkflow.robot
@@ -12,7 +12,7 @@ NS Instance Deletion
Check resource not_instantiated
DELETE IndividualNSInstance
Check HTTP Response Status Code Is 204
- Check HTTP Response Body Json Schema Is NsIdentifierDeletionNotification.schema.json
+ Check HTTP Response Body Json Schema Is NsIdentifierDeletionNotification
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
index eead9b8e..b86573d3 100644
--- a/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/FailOperationTask.robot
@@ -17,13 +17,13 @@ Post Fail operation task Not Found
[Setup] Check Fail not supported
POST Fail operation task
Check HTTP Response Status Code Is 404
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
Post Fail operation task Conflict
Depends on test failure Check resource FAILED_TEMP
POST Fail operation task
Check HTTP Response Status Code Is 409
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
PUT Fail operation task - Method not implemented
PUT Fail operation task
diff --git a/SOL005/NSLifecycleManagement-API/HealNSTask.robot b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
index 732376dc..3a5e3f00 100644
--- a/SOL005/NSLifecycleManagement-API/HealNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/HealNSTask.robot
@@ -18,7 +18,7 @@ Heal a NSInstance Conflict
POST Heal NSInstance
Check HTTP Response Status Code Is 409
Check HTTP Response Header Contains ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
GET Heal NSInstance- Method not implemented
GET Heal NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
index bcf68fb7..16850e75 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSInstance.robot
@@ -16,7 +16,7 @@ Get Information about an individual NS Instance
GET IndividualNSInstance
Check HTTP Response Status Code Is 200
Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is NsInstance.schema.json
+ Check HTTP Response Body Json Schema Is NsInstance
PUT Individual NSInstance - Method not implemented
PUT IndividualNSInstance
@@ -35,4 +35,4 @@ DELETE Individual NSInstance Conflict
DELETE IndividualNSInstance
Check HTTP Response Status Code Is 409
Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
diff --git a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
index 3914bee7..b51d2b14 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualNSLCMOccurences.robot
@@ -27,7 +27,7 @@ Get stauts information about Individual NS LCM OP OCC
GET Individual NS LCN OP Occurence
Check HTTP Response Status Code Is 200
Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is NsLcmOpOcc.schema.json
+ Check HTTP Response Body Json Schema Is NsLcmOpOcc
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
index 5ba45ce7..6d734b90 100644
--- a/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
+++ b/SOL005/NSLifecycleManagement-API/IndividualSubscription.robot
@@ -16,7 +16,7 @@ Post Individual Subscription - Method not implemented
Get Information about an individual subscription
GET Individual subscription
Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is subscription.schema.json
+ Check HTTP Response Body Json Schema Is subscription
PUT an individual subscription - Method not implemented
PUT Individual Subscription
diff --git a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
index dc474e79..a297dfe3 100644
--- a/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/InstantiateNSTask.robot
@@ -17,8 +17,7 @@ Instantiate a nsInstance Conflict
[Setup] Check resource instantiated
POST Instatiate nsInstance
Check HTTP Response Status Code Is 409
- Check HTTP Response Header Contains ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
GET Instantiate NSInstance - Method not implemented
GET Instantiate NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/NSInstances.robot b/SOL005/NSLifecycleManagement-API/NSInstances.robot
index efb6445b..c74944d1 100644
--- a/SOL005/NSLifecycleManagement-API/NSInstances.robot
+++ b/SOL005/NSLifecycleManagement-API/NSInstances.robot
@@ -11,26 +11,22 @@ Create a new NsInstance
POST New nsInstance
Check HTTP Response Status Code Is 201
Check HTTP Response Header Contains Location
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is NsInstance.schema.json
+ Check HTTP Response Body Json Schema Is NsInstance
Get information about multiple NS instances
GET NsInstances
Check HTTP Response Status Code Is 200
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is NsInstances.schema.json
+ Check HTTP Response Body Json Schema Is NsInstances
Get information about multiple NS instances Bad Request Invalid attribute-based filtering parameters
GET NsInstance Invalid Attribute-Based filtering parameter
Check HTTP Response Status Code Is 400
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
Get information about multiple NS instances Bad Request Invalid attribute selector
GET NsInstance Invalid Attribute Selector
Check HTTP Response Status Code Is 400
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
PUT NSInstances - Method not implemented
PUT NSInstances
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
index 7f9188c2..5a15ef38 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOccurences.robot
@@ -26,16 +26,15 @@ DELETE stauts information about multiple NS LCM OP OCC - Method not implemented
Get stauts information about multiple NS LCM OP OCC
GET NS LCN OP Occurences
Check HTTP Response Status Code Is 200
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is NsLcmOpOccs.schema.json
+ Check HTTP Response Body Json Schema Is NsLcmOpOccs
Get stauts information about multiple NS LCM OP OCC Bad Request Invalid attribute-based filtering parameters
GET NS LCN OP Occurences Invalid attribute-based filtering parameters
Check HTTP Response Status Code Is 400
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
Get stauts information about multiple NS LCM OP OCC Bad Request Invalid attribute selector
GET NS LCN OP Occurences Invalid attribute selector
Check HTTP Response Status Code Is 400
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
\ No newline at end of file
diff --git a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
index ca6405eb..c837de30 100644
--- a/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
+++ b/SOL005/NSLifecycleManagement-API/NSLCMOperationKeywords.robot
@@ -135,7 +135,8 @@ Check HTTP Response Header Contains
Log Header is present
Check HTTP Response Body Json Schema Is
- [Arguments] ${schema}
+ [Arguments] ${input}
+ ${schema} = Catenate ${input} .schema.json
Validate Json ${schema} ${response[0]['body']}
Log Json Schema Validation OK
diff --git a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
index 383968bb..99210715 100644
--- a/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RetryOperationTask.robot
@@ -18,13 +18,13 @@ Post Retry operation task Not Found
[Setup] Check retry not supported
POST Retry operation task
Check HTTP Response Status Code Is 404
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
Post Retry operation task Conflict
Depends on test failure Check resource FAILED_TEMP
POST Retry operation task
Check HTTP Response Status Code Is 409
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
PUT Retry operation task - Method not implemented
PUT Retry operation task
diff --git a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
index caced79a..f0765aa3 100644
--- a/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
+++ b/SOL005/NSLifecycleManagement-API/RollbackOperationTask.robot
@@ -18,13 +18,13 @@ Post Rollback operation task Not Found
[Setup] Check Rollback not supported
POST Rollback operation task
Check HTTP Response Status Code Is 404
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
Post Rollback operation task Conflict
Depends on test failure Check resource FAILED_TEMP
POST Rollback operation task
Check HTTP Response Status Code Is 409
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
PUT Rollback operation task - Method not implemented
PUT Rollback operation task
diff --git a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
index e4328d4f..6c2320d9 100644
--- a/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/ScaleNSTask.robot
@@ -17,8 +17,7 @@ Instantiate a nsInstance Conflict
[Setup] Check resource not_instantiated
POST scale nsInstance
Check HTTP Response Status Code Is 409
- Check HTTP Response Header Contains ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
GET Scale NSInstance- Method not implemented
GET scale NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/Subscriptions.robot b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
index b55960ff..f9a87961 100644
--- a/SOL005/NSLifecycleManagement-API/Subscriptions.robot
+++ b/SOL005/NSLifecycleManagement-API/Subscriptions.robot
@@ -11,32 +11,29 @@ Create a new subscription
POST subscriptions
Check HTTP Response Status Code Is 201
Check HTTP Response Header Contains Location
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is subscription.schema.json
+ Check HTTP Response Body Json Schema Is subscription
Create a new Subscription - DUPLICATION
POST subscriptions DUPLICATION
Check HTTP Response Status Code Is 201
Check HTTP Response Header Contains Location
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is subscription.schema.json
+ Check HTTP Response Body Json Schema Is subscription
Create a new Subscription - NO-DUPLICATION
POST subscriptions NO DUPLICATION
Check HTTP Response Status Code Is 201
Check HTTP Response Header Contains Location
- Check HTTP Response Header ContentType is ${CONTENT_TYPE}
GET Subscriptions
GET Subscriptions
Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is subscriptions.schema.json
+ Check HTTP Response Body Json Schema Is subscriptions
GET Subscription - Filter
GET Subscriptions with filter
Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is subscriptions.schema.json
+ Check HTTP Response Body Json Schema Is subscriptions
PUT subscriptions - Method not implemented
PUT subscriptions
diff --git a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
index 574992e3..29f8bc60 100644
--- a/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/TerminateNSTask.robot
@@ -17,8 +17,7 @@ Terminate a NSInstance Conflict
[Setup] Check resource not_instantiated
POST Terminate NSInstance
Check HTTP Response Status Code Is 409
- Check HTTP Response Header Contains ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
GET Terminate NSInstance- Method not implemented
GET Terminate NSInstance
diff --git a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
index fd1832e3..f1f397ab 100644
--- a/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
+++ b/SOL005/NSLifecycleManagement-API/UpdateNSTask.robot
@@ -17,8 +17,7 @@ Update a NSInstance Conflict
[Setup] Check resource not_instantiated
POST Update NSInstance
Check HTTP Response Status Code Is 409
- Check HTTP Response Header Contains ${CONTENT_TYPE}
- Check HTTP Response Body Json Schema Is ProblemDetails.schema.json
+ Check HTTP Response Body Json Schema Is ProblemDetails
GET Update NSInstance- Method not implemented
GET Update NSInstance
--
GitLab