From e731118eca0540792a140803f18c298fb3be132d Mon Sep 17 00:00:00 2001 From: ToineSiebelink Date: Tue, 10 Nov 2020 16:32:50 +0000 Subject: Adding & Testing method for breaking JSON Data into 'fragments' Improving Bookstore test model https://jira.onap.org/browse/CPS-32 Issue-ID: CPS-32 Change-Id: Ie03e03c041233aa908ab55902c1b387f96eb1c2e Signed-off-by: ToineSiebelink --- cps-service/src/test/resources/bookstore.json | 54 ++++++++++++++++++--------- cps-service/src/test/resources/bookstore.yang | 13 +++++-- 2 files changed, 46 insertions(+), 21 deletions(-) (limited to 'cps-service/src/test/resources') diff --git a/cps-service/src/test/resources/bookstore.json b/cps-service/src/test/resources/bookstore.json index 44d5d424c..d1b8d6882 100644 --- a/cps-service/src/test/resources/bookstore.json +++ b/cps-service/src/test/resources/bookstore.json @@ -1,34 +1,52 @@ { "test:bookstore":{ - "categories":[ + "bookstore-name": "Chapters", + "categories": [ { - "name":"web", - "books":[ + "code": "01", + "name": "SciFi", + "books": [ { - "authors":[ - "Toine Siebelink","David Lang" + "authors": [ + "Iain M. Banks" ], - "lang":"en", - "price":"123456", - "pub_year":"2020", - "title":"My first book" + "lang": "en", + "price": "895", + "pub_year": "1994", + "title": "Feersum Endjinn" + }, + { + "authors": [ + "Ursula K. Le Guin", + "Joe Haldeman", + "Orson Scott Card", + "david Brin", + "Rober Silverberg", + "Dan Simmons", + "Greg Bear" + ], + "lang": "en", + "price": "1099", + "pub_year": "1999", + "title": "Far Horizons" } ] }, { - "name":"art", - "books":[ + "name": "kids", + "code": "02", + "books": [ { - "authors":[ - "Test" + "authors": [ + "Philip Pullman" ], - "lang":"en", - "price":"1234", - "pub_year":"2020", - "title":"My 2nd book" + "lang": "en", + "price": "699", + "pub_year": "1995", + "title": "The Golden Compass" } ] } ] } -} \ No newline at end of file +} diff --git a/cps-service/src/test/resources/bookstore.yang b/cps-service/src/test/resources/bookstore.yang index 01eac5f33..2179fb93d 100644 --- a/cps-service/src/test/resources/bookstore.yang +++ b/cps-service/src/test/resources/bookstore.yang @@ -1,6 +1,5 @@ -module bookstore { +module stores { yang-version 1.1; - namespace "org:onap:ccsdk:sample"; prefix book-store; @@ -18,9 +17,17 @@ module bookstore { container bookstore { + leaf bookstore-name { + type string; + } + list categories { - key name; + key "code"; + + leaf code { + type string; + } leaf name { type string; -- cgit 1.2.3-korg