Added 0.0.2 API and Jenkinsfile

Author: Manuel Perez Belmonte

Jenkinsfile

@@ -15,8 +15,8 @@ node('docker') {
                 echo ("Packaging")
                 sh 'mvn package -DskipTests'
 
-            stage "Archive atifacts"
-                archiveArtifacts artifacts: 'elastest-cost-engine/target/*.jar'
+            stage "Archive artifacts"
+                archiveArtifacts artifacts: 'target/*.jar'
 
             stage "Build image - Package"
                 echo ("Building")

api.yaml

@@ -1,10 +1,9 @@
 ---
 swagger: '2.0'
 info:
-  version: '0.0.1'
+  version: '0.0.2'
   title: Cost, Energy and Resource Consumption Modeling Engines API specification
   description: RESTful API specification for the ElasTest Cost Modeling service
-  termsOfService: http://www.piyush-harsh.info/tos.txt
   contact:
     name: Manu Perez
     email: [email protected]
@@ -54,14 +53,14 @@ paths:
             $ref: "#/definitions/CostModelDefinition"
       responses:
         201:
-          description: Created
-          schema:
-            $ref: "#/definitions/CreateCostModelOutput"
+          description: OK
+#          description: Created
+#          schema:
+#            $ref: "#/definitions/CreateCostModelOutput"
         default:
           description: Unexpexted error
           schema:
             $ref: "#/definitions/UnexpectedError"
-  /costmodel/{id}:
     get:
       description: Get details about a given Cost Model.
       produces:
@@ -70,152 +69,165 @@ paths:
         200:
           description: OK
           schema:
-            $ref: "#/definitions/CostModelDetail"
+            $ref: "#/definitions/CostModelDefinition"
         default:
           description: Unexpected Error
           schema:
             $ref: "#/definitions/UnexpectedError"
-    delete:
+  /deletecostModel:
+    post:
       description: Deletes a given Cost Model.
       produces:
         - application/json
       parameters:
         - 
           in: body
           name: body
-          description: Cost model to be deleted
+          description: Cost Model Id to be deleted
           schema:
-            $ref: "#/definitions/UnexpectedError"
+            $ref: "#/definitions/DeleteCostModel"
       responses:
         200:
           description: OK
-          schema:
-            $ref: "#/definitions/DeleteCostModelOutput"
+#          schema:
+#            $ref: "#/definitions/DeleteCostModel"
         default:
           description: Unexpected Error
           schema:
             $ref: "#/definitions/UnexpectedError"
-  /estimate/{testId}/costmodel/{costModelId}:
-    get:
+  /estimate:
+    post:
       description: Get a cost estimate of a Test Job running on a given Cost Model.
       produces:
         - application/json
-      responses:
-        200:
-          description: OK
-          schema:
-            $ref: "#/definitions/EstimateCostModelOutput"
-        default:
-          description: Unexpected Error
-          schema:
-            $ref: "#/definitions/UnexpectedError"
-  /status/{SuTId}:
-    get:
-      description: Get the current status of a running System under Test.
-      produces:
-        - application/json
-      responses:
-        200:
-          description: OK
-          schema:
-              $ref: "#/definitions/Status"
-        default:
-          description: Unexpected Error
+      parameters:
+        -
+          in: body
+          name: body
+          description: Test Id and Cost Model Id
           schema:
-            $ref: "#/definitions/UnexpectedError"
-  /cost/{SuTId}:
-    get:
-      description: Get the final cost of a finished Test on a System under Test.
-      produces:
-        - application/json
+            $ref: "#/definitions/EstimateBody"
       responses:
         200:
           description: OK
           schema:
-            $ref: "#/definitions/Cost"
+            $ref: "#/definitions/EstimateCostModelOutput"
         default:
           description: Unexpected Error
           schema:
             $ref: "#/definitions/UnexpectedError"
+#  /status/{SuTId}:
+#    get:
+#      description: Get the current status of a running System under Test.
+#      produces:
+#        - application/json
+#      responses:
+#        200:
+#          description: OK
+#          schema:
+#              $ref: "#/definitions/Status"
+#        default:
+#          description: Unexpected Error
+#          schema:
+#            $ref: "#/definitions/UnexpectedError"
+#  /cost/{SuTId}:
+#    get:
+#      description: Get the final cost of a finished Test on a System under Test.
+#      produces:
+#        - application/json
+#      responses:
+#        200:
+#          description: OK
+#          schema:
+#            $ref: "#/definitions/Cost"
+#        default:
+#          description: Unexpected Error
+#          schema:
+#            $ref: "#/definitions/UnexpectedError"
 
 definitions:
   UnexpectedError:
     type: object
     properties:
       Error:
         type: string
-  Cost:
+  EstimateCostModelOutput:
     type: object
     properties:
-      SuT:
+      testId:
+        type: string
+      costModelId:
         type: string
-      startTime:
-        type: int64
-      endTime:
-        type: int64
-      cost:
+      estimatedCost:
         type: double
       unit:
         type: string
-  CostModelDetail:
+  CostModelDefinition:
     type: object
     properties:
-      ModelId:
+      name:
         type: string
-  CreateCostModel:
-    type: object
-    properties:
-      ModelId:
+      type:
         type: string
-  EstimateCostModelOutput:
+      fix_cost:
+        type: array
+        items:
+          $ref: "#/definitions/FixCost"
+      var_rate:
+        type: array
+        items:
+          $ref: "#/definitions/VarRate"
+      components:
+        type: array
+        items:
+          $ref: "#/definitions/Component"
+      description:
+        type: string
+  EstimateBody:
     type: object
     properties:
       testId:
         type: string
       costModelId:
         type: string
-      estimatedCost:
-        type: double
-      unit:
-        type: string
-  CreateCostModelOutput:
+  FixCost:
     type: object
     properties:
-      ModelId:
-        type: string
-  DeleteCostModelOutput:
+      fix_costX:
+        type: double
+  VarRate:
     type: object
     properties:
-      costModelId:
-        type: string
-      status:
-        type: string
-  Status:
+      var_rateX:
+        type: double
+  Component:
     type: object
     properties:
-      SuT:
-        type: string
-      startTime:
-        type: int64
-      Cost:
-        type: double
-      Unit:
-        type: string
-      Status:
+      componentX:
         type: string
-  CostModelDefinition:
+  DeleteCostModel:
     type: object
     properties:
-      name:
+      costModelId:
+        type: string
+      status:
         type: string
-      definiton: 
-        - expressionName: string
-          expression: string
-          expressionDefinition:
-            fieldX: string
-            fieldY: string
-        - expressionName: PAYG
-          expression: (usedSeconds * pricePerSecond)
-          expressionDefinition:
-            usedSeconds: int64
-            pricePerSecond: double
+
+#  CreateCostModelOutput:
+#    type: object
+#    properties:
+#      ModelId:
+#        type: string
+#  Status:
+#    type: object
+#    properties:
+#      SuT:
+#        type: string
+#      startTime:
+#        type: int64
+#      Cost:
+#        type: double
+#      Unit:
+#        type: string
+#      Status:
+#        type: string