2 files changed, 30 insertions, 8 deletions

diff --git a/integration-test/src/test/resources/data/bookstore/bookstore-types.yang b/integration-test/src/test/resources/data/bookstore/bookstore-types.yang
new file mode 100644
index 0000000000..5ad7b6e130
--- /dev/null
+++ b/integration-test/src/test/resources/data/bookstore/bookstore-types.yang
@@ -0,0 +1,18 @@
+module bookstore-types {
+  yang-version 1.1;
+  namespace "org:onap:cps:types:sample";
+
+  prefix types;
+
+  revision "2024-01-30" {
+    description
+      "Sample Types";
+  }
+
+  typedef year {
+    type uint16 {
+      range "1000..9999";
+    }
+  }
+
+}
\ No newline at end of file
diff --git a/integration-test/src/test/resources/data/bookstore/bookstore.yang b/integration-test/src/test/resources/data/bookstore/bookstore.yang
index 9c6c42e28a..2abde656d4 100644
--- a/integration-test/src/test/resources/data/bookstore/bookstore.yang
+++ b/integration-test/src/test/resources/data/bookstore/bookstore.yang
@@ -1,18 +1,22 @@
 module stores {
     yang-version 1.1;
-    namespace "org:onap:ccsdk:sample";
+    namespace "org:onap:cps:sample";
 
     prefix book-store;
 
-    revision "2020-09-15" {
+    import bookstore-types {
+        prefix "types";
+        revision-date 2024-01-30;
+    }
+
+    revision "2024-01-30" {
         description
-        "Sample Model";
+            "Extracted bookstore types";
     }
 
-    typedef year {
-        type uint16 {
-            range "1000..9999";
-        }
+    revision "2020-09-15" {
+        description
+        "Sample Model";
     }
 
     list bookstore-address {
@@ -106,7 +110,7 @@ module stores {
                     type string;
                 }
                 leaf-list editions {
-                    type year;
+                    type types:year;
                 }
                 leaf price {
                     type uint64;