Merge "Correction of Bug 67"

docker/validate-in-docker.sh

@@ -23,7 +23,7 @@ function validate_api () {
   echo "--- Merging file."
   merged_file="../build/${deliverable}-${api}-API.yaml"
   json_file="../build/${deliverable}-${api}-API.json"
-  json-refs resolve "${file}" > "${merged_file}"
+  json-refs --filter relative resolve "${file}" > "${merged_file}"
   yaml2json "${merged_file}" > "${json_file}"
   
   # Create the PDF version

src/SOL003/VNFFaultManagement/VNFFaultManagement.yaml

@@ -82,7 +82,7 @@ paths:
               maximum: 1
               minimum: 1
           schema:
-            $ref: "../definitions/SOL003_def.yaml#/definitions/Alarm"
+            $ref: "#/definitions/Alarm"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-based-filtering-error"
         401:
@@ -156,7 +156,7 @@ paths:
               maximum: 1
               minimum: 1
           schema:
-            $ref: "../definitions/SOL003_def.yaml#/definitions/Alarm"
+            $ref: "#/definitions/Alarm"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
         401:
@@ -183,7 +183,7 @@ paths:
           in: body
           required: true
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications"
+            $ref: "#/definitions/AlarmModifications"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
@@ -232,7 +232,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications"
+            $ref: "#/definitions/AlarmModifications"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
         401:
@@ -278,7 +278,7 @@ paths:
           in: body
           required: true
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest"
+            $ref: "#/definitions/FmSubscriptionRequest"
         - name: Accept
           description: >
             Content-Types that are acceptable for the response.
@@ -331,7 +331,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription"
+            $ref: "#/definitions/FmSubscription"
         303:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/303"
         400:
@@ -403,7 +403,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription"
+            $ref: "#/definitions/FmSubscription"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400-attr-based-filtering-error"
         401:
@@ -490,7 +490,7 @@ paths:
               maximum: 1
               minimum: 0
           schema:
-            $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription"
+            $ref: "#/definitions/FmSubscription"
         400:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400"
         401:
@@ -549,3 +549,16 @@ paths:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/500"
         503:
           $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/503"
+
+###############################################################################
+# Definitions                                                                 #
+###############################################################################
+definitions: 
+  Alarm:
+    $ref: "../definitions/SOL003_def.yaml#/definitions/Alarm"
+  AlarmModifications:
+    $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/AlarmModifications"
+  FmSubscription:
+    $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscription"
+  FmSubscriptionRequest:
+    $ref: "../../definitions/SOL002SOL003VNFFaultManagement_def.yaml#/definitions/FmSubscriptionRequest"
\ No newline at end of file