Fix: Make bookstore data consistent
- Removed list named invoice from all bookstore files
- Added a new parent list as bookstore-address
- Refactored tests
Issue-ID: CPS-1813
Signed-off-by: Arpit Singh <as00745003@techmahindra.com>
Change-Id: I5c7e83e1ee0ad9ac1d94d1906c2361c7a00d49af
diff --git a/cps-service/src/test/resources/bookstore.json b/cps-service/src/test/resources/bookstore.json
index 4b8ed3d..c5fd0ff 100644
--- a/cps-service/src/test/resources/bookstore.json
+++ b/cps-service/src/test/resources/bookstore.json
@@ -1,10 +1,9 @@
{
- "multiple-data-tree:invoice": [
+ "bookstore-address": [
{
- "ProductID": "1",
- "ProductName": "Apple",
- "price": "100",
- "stock": false
+ "bookstore-name": "Easons",
+ "address": "Dublin,Ireland",
+ "postal-code": "D02HA21"
}
],
"test:bookstore":{
diff --git a/cps-service/src/test/resources/bookstore.yang b/cps-service/src/test/resources/bookstore.yang
index b7a52e2..2033fc7 100644
--- a/cps-service/src/test/resources/bookstore.yang
+++ b/cps-service/src/test/resources/bookstore.yang
@@ -15,31 +15,22 @@
}
}
- list invoice {
- key "ProductID";
- leaf ProductID {
- type uint64;
- mandatory "true";
- description
- "Unique product ID. Example: 001";
- }
- leaf ProductName {
+ list bookstore-address {
+ key "bookstore-name";
+ leaf bookstore-name {
type string;
- mandatory "true";
description
- "Name of the Product";
+ "Name of bookstore. Example: My Bookstore";
}
- leaf price {
- type uint64;
- mandatory "true";
+ leaf address {
+ type string;
description
- "Price of book";
+ "Address of store";
}
- leaf stock {
- type boolean;
- default "false";
+ leaf postal-code {
+ type string;
description
- "Book in stock or not. Example value: true";
+ "Postal code of store";
}
}