Implementation of Data Deployment and Unit Test For Phase2

Issue-ID: POLICY-5232,POLICY-5278 Change-Id: I9fcce97e5a91ec9b63f5f89ab27a96ab0de0c76f Signed-off-by: Shalini Shivam <ss00765416@techmahindra.com>
author: Shalini Shivam <ss00765416@techmahindra.com> 2025-02-21 14:40:10 +0100
committer: Shalini Shivam <ss00765416@techmahindra.com> 2025-02-25 10:40:58 +0100
commit: 7d45fbc19df8adf714deeab1fe267d632c30b411 (patch)
tree: 48bce9de5811af3cc612e8ea84956e5473b8aba3
parent: 1465593e7293ca7e839b49f353b96111928f14c5 (diff)
37 files changed, 5873 insertions, 611 deletions
diff --git a/api/openapi.yaml b/api/openapi.yaml
index 8fe3d2c..685bd4f 100644
--- a/api/openapi.yaml
+++ b/api/openapi.yaml
@@ -20,7 +20,7 @@ openapi: 3.0.3
 info:
   title: "Policy OPA PDP Documentation"
   description: Policy OPA PDP Service
-  version: 1.0.2
+  version: 1.0.3
   x-component: Policy Framework
   x-planned-retirement-date: tbd
   contact:
@@ -33,7 +33,7 @@ tags:
 - name: Decision
 - name: Statistics
 - name: HealthCheck
-
+- name: Dynamic Data Update
 paths:
   /decision:
     post:
@@ -89,7 +89,7 @@ paths:
             application/yaml:
               schema:
                 $ref: '#/components/schemas/OPADecisionResponse'
-            
+
         400:
           description: Bad Request
           content:
@@ -232,7 +232,161 @@ paths:
       x-interface info:
         last-mod-release: Paris
         pdpo-version: 1.0.0
- 
+  /data/{path}:
+    patch:
+      tags:
+      - Dynamic Data Update
+      summary: Updates the data which is already added by a PUT request
+      description: Returns the success or failure response
+      operationId: patchdata
+      parameters:
+      - name: X-ONAP-RequestID
+        in: header
+        description: RequestID for http transaction
+        schema:
+          type: string
+          format: uuid
+      - name: path
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OPADataUpdateRequest'
+          application/yaml:
+            schema:
+              $ref: '#/components/schemas/OPADataUpdateRequest'
+        required: false
+      responses:
+        200:
+          description: successful operation
+          headers:
+            X-LatestVersion:
+              description: Used only to communicate an API's latest version
+              schema:
+                type: string
+            X-PatchVersion:
+              description: Used only to communicate a PATCH version in a response
+                for troubleshooting purposes only, and will not be provided by the
+                client on request
+              schema:
+                type: string
+            X-MinorVersion:
+              description: Used to request or communicate a MINOR version back from
+                the client to the server, and from the server back to the client
+              schema:
+                type: string
+            X-ONAP-RequestID:
+              description: Used to track REST transactions for logging purpose
+              schema:
+                type: string
+                format: uuid
+          content: {}
+
+        400:
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+            application/yaml:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        401:
+          description: Authentication Error
+          content: {}
+        403:
+          description: Authorization Error
+          content: {}
+        404:
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+            application/yaml:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        500:
+          description: Internal Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+            application/yaml:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+      security:
+      - basicAuth: []
+      x-interface info:
+        last-mod-release: Paris
+        pdpo-version: 1.0.0
+      x-codegen-request-body-name: body
+    get:
+      tags:
+      - Dynamic Data Update
+      summary: Gets the data dynamically
+      description: Returns success or failure
+      operationId: data-get
+      parameters:
+      - name: X-ONAP-RequestID
+        in: header
+        description: RequestID for http transaction
+        schema:
+          type: string
+          format: uuid
+      - name: path
+        in: path
+        required: true
+        style: simple
+        explode: false
+        schema:
+          type: string
+      responses:
+        200:
+          description: successful operation
+          headers:
+            X-LatestVersion:
+              description: Used only to communicate an API's latest version
+              schema:
+                type: string
+            X-PatchVersion:
+              description: Used only to communicate a PATCH version in a response
+                for troubleshooting purposes only, and will not be provided by the
+                client on request
+              schema:
+                type: string
+            X-MinorVersion:
+              description: Used to request or communicate a MINOR version back from
+                the client to the server, and from the server back to the client
+              schema:
+                type: string
+            X-ONAP-RequestID:
+              description: Used to track REST transactions for logging purpose
+              schema:
+                type: string
+                format: uuid
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OPADataResponse'
+            application/yaml:
+              schema:
+                $ref: '#/components/schemas/OPADataResponse'
+        401:
+          description: Authentication Error
+          content: {}
+        403:
+          description: Authorization Error
+          content: {}
+        500:
+          description: Internal Server Error
+          content: {}
 components:
   schemas:
     ErrorResponse:
@@ -298,7 +452,43 @@ components:
       - policyName
       - policyFilter
       - input
-      
+    OPADataUpdateRequest:
+      type: object
+      properties:
+        onapName:
+          type: string
+        onapComponent:
+          type: string
+        onapInstance:
+          type: string
+        currentDateTime:
+          type: string
+          format: date-time
+        currentDate:
+          type: string
+          format: date
+        currentTime:
+          type: string
+          format: time
+        timeZone:
+          type: string
+          description: "Timezone in IANA format (e.g., 'America/NewYork', 'Europe/Paris', 'UTC')"
+        timeOffset:
+          type: string
+          pattern: '^[+-]?\d{2}:\d{2}$'
+          description: "Time offset in hours and minutes, e.g., '+02:00' or '-05:00'"
+        policyName:
+          type: string
+        data:
+          type: array
+          items:
+             type: object
+          example:
+                -
+                    user: alice
+                    action: read
+                    object: id123
+                    type: dog
     HealthCheckReport:
       type: object
       properties:
@@ -326,7 +516,7 @@ components:
       required:
       - policyName
       - output
-      
+
     StatisticsReport:
       type: object
       properties:
@@ -360,7 +550,14 @@ components:
         decisionFailureCount:
           type: integer
           format: int64
-    
+    OPADataResponse:
+      type: object
+      properties:
+         data:
+           anyOf:
+           - x-go-type: "interface{}"
+           - type: object
+             additionalProperties: true
   securitySchemes:
     basicAuth:
       type: http
diff --git a/api/register-handlers.go b/api/register-handlers.go
index 0504e48..34878c3 100644
--- a/api/register-handlers.go
+++ b/api/register-handlers.go
@@ -25,8 +25,10 @@ import (
 	"net/http"
 	"policy-opa-pdp/cfg"
 	"policy-opa-pdp/pkg/bundleserver"
+	"policy-opa-pdp/pkg/data"
 	"policy-opa-pdp/pkg/decision"
 	"policy-opa-pdp/pkg/healthcheck"
+	"policy-opa-pdp/pkg/log"
 	"policy-opa-pdp/pkg/metrics"
 	"policy-opa-pdp/pkg/opasdk"
 )
@@ -57,6 +59,9 @@ func RegisterHandlers() {
 	listPoliciesHandler := http.HandlerFunc(opasdk.ListPolicies)
 	http.Handle("/opa/listpolicies", listPoliciesHandler)
 
+	dataHandler := http.HandlerFunc(data.DataHandler)
+	http.Handle("/policy/pdpo/v1/data/", basicAuth(dataHandler))
+
 }
 
 // handles authentication
@@ -82,5 +87,8 @@ func validateCredentials(username, password string) bool {
 // handles readiness probe endpoint
 func readinessProbe(res http.ResponseWriter, req *http.Request) {
 	res.WriteHeader(http.StatusOK)
-	res.Write([]byte("Ready"))
+	_, err := res.Write([]byte("Ready"))
+	if err != nil {
+		log.Errorf("Failed to write response: %v", err)
+	}
 }
diff --git a/cmd/opa-pdp/opa-pdp.go b/cmd/opa-pdp/opa-pdp.go
index ccc9f5d..468a193 100644
--- a/cmd/opa-pdp/opa-pdp.go
+++ b/cmd/opa-pdp/opa-pdp.go
@@ -93,14 +93,13 @@ func main() {
 	if err != nil || kc == nil {
 		log.Warnf("Kafka consumer initialization failed: %v", err)
 	}
-	defer producer.Close()
-
 	sender := &publisher.RealPdpStatusSender{Producer: producer}
 
 	// start pdp message handler in a seperate routine
 	handleMessagesFunc(ctx, kc, sender)
 
 	time.Sleep(10 * time.Second)
+
 	// pdp registration
 	isRegistered := registerPDPFunc(sender)
 	if !isRegistered {
@@ -112,14 +111,18 @@ func main() {
 	// Handle OS Interrupts and Graceful Shutdown
 	interruptChannel := make(chan os.Signal, 1)
 	signal.Notify(interruptChannel, os.Interrupt, syscall.SIGTERM, syscall.SIGINT, syscall.SIGHUP)
-	handleShutdownFunc(kc, interruptChannel, cancel)
+	handleShutdownFunc(kc, interruptChannel, cancel, producer)
 }
 
+type PdpMessageHandlerFunc func(ctx context.Context, kc *kafkacomm.KafkaConsumer, topic string, p publisher.PdpStatusSender) error
+
+var PdpMessageHandler PdpMessageHandlerFunc = handler.PdpMessageHandler
+
 // starts pdpMessage Handler in a seperate routine which handles incoming messages on Kfka topic
 func handleMessages(ctx context.Context, kc *kafkacomm.KafkaConsumer, sender *publisher.RealPdpStatusSender) {
 
 	go func() {
-		err := handler.PdpMessageHandler(ctx, kc, topic, sender)
+		err := PdpMessageHandler(ctx, kc, topic, sender)
 		if err != nil {
 			log.Warnf("Erro in PdpUpdate Message Handler: %v", err)
 		}
@@ -147,7 +150,8 @@ func initializeBundle(execCmd func(string, ...string) *exec.Cmd) (string, error)
 }
 
 func startHTTPServer() *http.Server {
-	server := &http.Server{Addr: consts.ServerPort}
+	//Configures the HTTP server to wait a maximum of 5 seconds for the headers of incoming requests
+	server := &http.Server{Addr: consts.ServerPort, ReadHeaderTimeout: 5 * time.Second}
 	go func() {
 		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Errorf("Server error: %s", err)
@@ -156,11 +160,15 @@ func startHTTPServer() *http.Server {
 	return server
 }
 
+type ShutdownServFunc func(server *http.Server, ctx context.Context) error
+
+var ShutdownServ ShutdownServFunc = (*http.Server).Shutdown
+
 func shutdownHTTPServer(server *http.Server) {
 	timeoutContext, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
 
-	if err := server.Shutdown(timeoutContext); err != nil {
+	if err := ShutdownServ(server, timeoutContext); err != nil {
 		log.Warnf("Failed to gracefully shut down server: %v", err)
 	} else {
 		log.Debug("Server shut down gracefully")
@@ -180,13 +188,21 @@ func initializeOPA() error {
 	return nil
 }
 
+type NewKafkaConsumerFunc func() (*kafkacomm.KafkaConsumer, error)
+
+var NewKafkaConsumer NewKafkaConsumerFunc = kafkacomm.NewKafkaConsumer
+
+type GetKafkaProducerFunc func(bootstrapServers string, topic string) (*kafkacomm.KafkaProducer, error)
+
+var GetKafkaProducer GetKafkaProducerFunc = kafkacomm.GetKafkaProducer
+
 func startKafkaConsAndProd() (*kafkacomm.KafkaConsumer, *kafkacomm.KafkaProducer, error) {
-	kc, err := kafkacomm.NewKafkaConsumer()
+	kc, err := NewKafkaConsumer()
 	if err != nil {
 		log.Warnf("Failed to create Kafka consumer: %v", err)
 		return nil, nil, err
 	}
-	producer, err := kafkacomm.GetKafkaProducer(bootstrapServers, topic)
+	producer, err := GetKafkaProducer(bootstrapServers, topic)
 	if err != nil {
 		log.Warnf("Failed to create Kafka producer: %v", err)
 		return nil, nil, err
@@ -194,7 +210,7 @@ func startKafkaConsAndProd() (*kafkacomm.KafkaConsumer, *kafkacomm.KafkaProducer
 	return kc, producer, nil
 }
 
-func handleShutdown(kc *kafkacomm.KafkaConsumer, interruptChannel chan os.Signal, cancel context.CancelFunc) {
+func handleShutdown(kc *kafkacomm.KafkaConsumer, interruptChannel chan os.Signal, cancel context.CancelFunc, producer *kafkacomm.KafkaProducer) {
 
 myLoop:
 	for {
@@ -208,6 +224,8 @@ myLoop:
 	log.Debugf("Loop Exited and shutdown started")
 	signal.Stop(interruptChannel)
 
+	publisher.StopTicker()
+	producer.Close()
 	if kc == nil {
 		log.Debugf("kc is nil so skipping")
 		return
@@ -225,7 +243,6 @@ myLoop:
 	}
 
 	handler.SetShutdownFlag()
-	publisher.StopTicker()
 
 	time.Sleep(time.Duration(consts.SHUTDOWN_WAIT_TIME) * time.Second)
 }
diff --git a/cmd/opa-pdp/opa-pdp_test.go b/cmd/opa-pdp/opa-pdp_test.go
index 807f729..60bae08 100644
--- a/cmd/opa-pdp/opa-pdp_test.go
+++ b/cmd/opa-pdp/opa-pdp_test.go
@@ -20,24 +20,20 @@
 package main
 
 import (
+
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"os"
 	"os/exec"
 	"policy-opa-pdp/consts"
 	"policy-opa-pdp/pkg/kafkacomm"
-	"policy-opa-pdp/pkg/kafkacomm/handler"
 	"policy-opa-pdp/pkg/kafkacomm/mocks"
 	"policy-opa-pdp/pkg/kafkacomm/publisher"
 	"policy-opa-pdp/pkg/log"
 	"policy-opa-pdp/pkg/model"
-	"reflect"
 	"testing"
 	"time"
-
-	"bou.ke/monkey"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
@@ -61,6 +57,25 @@ func (m *MockKafkaConsumerInterface) ReadMessage(kc *kafkacomm.KafkaConsumer) ([
 	return args.Get(0).([]byte), args.Error(0)
 }
 
+type MockKafkaProducer struct {
+        mock.Mock
+}
+
+func (m *MockKafkaProducer) Produce(message *kafka.Message, evenchan chan kafka.Event) error {
+        args := m.Called(message)
+        return args.Error(0)
+}
+
+func (m *MockKafkaProducer) Close() {
+        m.Called()
+}
+
+func (m *MockKafkaProducer) Flush(timeout int) int {
+        m.Called(timeout)
+        return 0
+}
+
+
 type MockPdpStatusSender struct {
 	mock.Mock
 }
@@ -91,10 +106,22 @@ func TestHandleShutdown(t *testing.T) {
 	mockConsumer := new(mocks.KafkaConsumerInterface)
 	mockConsumer.On("Unsubscribe").Return(nil)
 	mockConsumer.On("Close").Return(nil)
+	kafkaProducer := &kafkacomm.KafkaProducer{}
 
 	mockKafkaConsumer := &kafkacomm.KafkaConsumer{
 		Consumer: mockConsumer,
 	}
+	// Create the mock producer
+        mockProducer := new(MockKafkaProducer)
+
+        // Mock the Produce method to simulate success
+        mockProducer.On("Produce", mock.Anything).Return(nil)
+        //t.Fatalf("Inside Sender checking for producer , but got: %v", mockProducer)
+
+
+        // Create the RealPdpStatusSender with the mocked producer
+        kafkaProducer = &kafkacomm.KafkaProducer{}
+
 	interruptChannel := make(chan os.Signal, 1)
 	_, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -105,7 +132,7 @@ func TestHandleShutdown(t *testing.T) {
 	}()
 	done := make(chan bool)
 	go func() {
-		handleShutdown(mockKafkaConsumer, interruptChannel, cancel)
+		handleShutdown(mockKafkaConsumer, interruptChannel, cancel, kafkaProducer)
 		done <- true
 	}()
 
@@ -118,10 +145,15 @@ func TestHandleShutdown(t *testing.T) {
 	}
 }
 
+var  testServer *http.Server
+var kafkaConsumer *kafkacomm.KafkaConsumer
+var kafkaProducer *kafkacomm.KafkaProducer
 // Test the main function to ensure it's initialization, startup, and shutdown correctly.
-func TestMainFunction(t *testing.T) {
+func SetupMocks() {
 	// Mock dependencies and expected behavior
-
+        testServer = &http.Server{}
+	kafkaConsumer= &kafkacomm.KafkaConsumer{}
+	kafkaProducer= &kafkacomm.KafkaProducer{}
 	// Mock initializeHandlers
 	initializeHandlersFunc = func() {
 		log.Debug("Handlers initialized")
@@ -155,28 +187,32 @@ func TestMainFunction(t *testing.T) {
 		return nil // no error expected
 	}
 
-	// Mock startKafkaConsAndProd
-	kafkaConsumer := &kafkacomm.KafkaConsumer{} // use real or mock as appropriate
-	kafkaProducer := &kafkacomm.KafkaProducer{}
-	startKafkaConsAndProdFunc = func() (*kafkacomm.KafkaConsumer, *kafkacomm.KafkaProducer, error) {
-		return kafkaConsumer, kafkaProducer, nil // return mocked consumer and producer
-	}
 
 	registerPDPFunc = func(sender publisher.PdpStatusSender) bool {
 		// Simulate the registration logic here
-		return false // Simulate successful registration
+		return false// Simulate successful registration
 	}
 
-	handleMessagesFunc = func(ctx context.Context, kc *kafkacomm.KafkaConsumer, sender *publisher.RealPdpStatusSender) {
-		return
-	}
+        handleMessagesFunc = func(ctx context.Context, kc *kafkacomm.KafkaConsumer, sender *publisher.RealPdpStatusSender) {
+                return
+        }
 
 	// Mock handleShutdown
 	interruptChannel := make(chan os.Signal, 1)
-	handleShutdownFunc = func(kc *kafkacomm.KafkaConsumer, interruptChan chan os.Signal, cancel context.CancelFunc) {
+	handleShutdownFunc = func(kc *kafkacomm.KafkaConsumer, interruptChan chan os.Signal, cancel context.CancelFunc, kp *kafkacomm.KafkaProducer) {
 		interruptChannel <- os.Interrupt
 		cancel()
 	}
+}
+
+func TestKafkaConsumerInitializationFailure(t *testing.T){
+
+
+        SetupMocks()
+
+	startKafkaConsAndProdFunc = func() (*kafkacomm.KafkaConsumer, *kafkacomm.KafkaProducer, error) {
+                return nil, nil, assert.AnError // return mocked consumer and producer
+        }
 
 	// Run main function in a goroutine
 	done := make(chan struct{})
@@ -186,6 +222,7 @@ func TestMainFunction(t *testing.T) {
 	}()
 
 	// Simulate an interrupt to trigger shutdown
+	interruptChannel := make(chan os.Signal, 1)
 	interruptChannel <- os.Interrupt
 
 	// Wait for main to complete or timeout
@@ -201,6 +238,73 @@ func TestMainFunction(t *testing.T) {
 	assert.True(t, true, "main function executed successfully")
 }
 
+func TestKafkaConsumerInitializationSuccess(t *testing.T){
+
+
+        SetupMocks()
+
+        startKafkaConsAndProdFunc = func() (*kafkacomm.KafkaConsumer, *kafkacomm.KafkaProducer, error) {
+                return kafkaConsumer, kafkaProducer, nil  // return mocked consumer and producer
+        }
+
+        // Run main function in a goroutine
+        done := make(chan struct{})
+        go func() {
+                main()
+                close(done)
+        }()
+
+        // Simulate an interrupt to trigger shutdown
+        interruptChannel := make(chan os.Signal, 1)
+        interruptChannel <- os.Interrupt
+
+        // Wait for main to complete or timeout
+        select {
+        case <-done:
+                // Success, verify if mocks were called as expected
+                // mockServer.AssertCalled(t, "Shutdown")
+        case <-time.After(1 * time.Second):
+                // t.Error("main function timed out")
+        }
+
+        // Verify assertions
+        assert.True(t, true, "main function executed successfully")
+}
+
+func TestKafkaNilConsumerInitialization(t *testing.T){
+
+
+        SetupMocks()
+
+        startKafkaConsAndProdFunc = func() (*kafkacomm.KafkaConsumer, *kafkacomm.KafkaProducer, error) {
+                return nil, kafkaProducer, nil  // return mocked consumer and producer
+        }
+
+        // Run main function in a goroutine
+        done := make(chan struct{})
+        go func() {
+                main()
+                close(done)
+        }()
+
+        // Simulate an interrupt to trigger shutdown
+        interruptChannel := make(chan os.Signal, 1)
+        interruptChannel <- os.Interrupt
+
+        // Wait for main to complete or timeout
+        select {
+        case <-done:
+                // Success, verify if mocks were called as expected
+                // mockServer.AssertCalled(t, "Shutdown")
+        case <-time.After(1 * time.Second):
+                // t.Error("main function timed out")
+        }
+
+        // Verify assertions
+        assert.True(t, true, "main function executed successfully")
+}
+
+
 // Test to validate that the OPA bundle initialization process works as expected.
 func TestInitializeBundle(t *testing.T) {
 	mockExecCmd := func(name string, arg ...string) *exec.Cmd {
@@ -223,6 +327,8 @@ func TestInitializeOPA(t *testing.T) {
 	assert.Error(t, err, "Expected error from initializeOPA")
 }
 
+
+
 // Test to ensure the application correctly waits for the server to be ready.
 func TestWaitForServer(t *testing.T) {
 	waitForServerFunc = func() {
@@ -308,7 +414,7 @@ func TestHandleShutdown_ErrorScenario(t *testing.T) {
 	mockKafkaConsumer := &kafkacomm.KafkaConsumer{
 		Consumer: mockConsumer,
 	}
-
+	kafkaProducer := &kafkacomm.KafkaProducer{}
 	interruptChannel := make(chan os.Signal, 1)
 	_, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -320,7 +426,7 @@ func TestHandleShutdown_ErrorScenario(t *testing.T) {
 
 	done := make(chan bool)
 	go func() {
-		handleShutdown(mockKafkaConsumer, interruptChannel, cancel)
+		handleShutdown(mockKafkaConsumer, interruptChannel, cancel, kafkaProducer)
 		done <- true
 	}()
 
@@ -408,6 +514,7 @@ func TestHandleMessages(t *testing.T) {
 
 }
 
+
 // Test to simulate a failure during OPA bundle initialization in the main function.
 func TestMain_InitializeBundleFailure(t *testing.T) {
 	initializeBundleFunc = func(cmdFn func(string, ...string) *exec.Cmd) (string, error) {
@@ -449,7 +556,7 @@ func TestMain_KafkaInitializationFailure(t *testing.T) {
 
 // Test to validate the main function's handling of shutdown signals.
 func TestMain_HandleShutdownWithSignals(t *testing.T) {
-	handleShutdownFunc = func(kc *kafkacomm.KafkaConsumer, interruptChan chan os.Signal, cancel context.CancelFunc) {
+	handleShutdownFunc = func(kc *kafkacomm.KafkaConsumer, interruptChan chan os.Signal, cancel context.CancelFunc, producer *kafkacomm.KafkaProducer) {
 		go func() {
 			interruptChan <- os.Interrupt // Simulate SIGTERM
 		}()
@@ -476,17 +583,17 @@ var mockProducer = &kafkacomm.KafkaProducer{}
 // Test to simulate the scenario where starting the Kafka consumer fails
 func TestStartKafkaConsumerFailure(t *testing.T) {
 	t.Run("Kafka consumer creation failure", func(t *testing.T) {
-		// Monkey patch the NewKafkaConsumer function with the correct signature (no parameters)
-		monkey.Patch(kafkacomm.NewKafkaConsumer, func() (*kafkacomm.KafkaConsumer, error) {
-			fmt.Println("Monkey patched NewKafkaConsumer is called")
+		originalNewKafkaConsumer := NewKafkaConsumer
+		originalGetKafkaProducer := GetKafkaProducer
+		NewKafkaConsumer = func() (*kafkacomm.KafkaConsumer, error) {
 			return nil, errors.New("Kafka consumer creation error")
-		})
+		}
 
-		// Monkey patch the GetKafkaProducer function with the correct signature
-		monkey.Patch(kafkacomm.GetKafkaProducer, func(bootstrapServers, topic string) (*kafkacomm.KafkaProducer, error) {
-			fmt.Println("Monkey patched GetKafkaProducer is called with bootstrapServers:", bootstrapServers, "and topic:", topic)
+		GetKafkaProducer = func(bootstrapServers, topic string) (*kafkacomm.KafkaProducer, error) {
+			NewKafkaConsumer = originalNewKafkaConsumer
+			GetKafkaProducer = originalGetKafkaProducer
 			return mockProducer, nil
-		})
+		}
 
 		// Call the function under test
 		consumer, producer, err := startKafkaConsAndProd()
@@ -495,27 +602,23 @@ func TestStartKafkaConsumerFailure(t *testing.T) {
 		assert.Error(t, err, "Kafka consumer creation error")
 		assert.Nil(t, consumer)
 		assert.Nil(t, producer)
-
-		// Unpatch the functions
-		monkey.Unpatch(kafkacomm.NewKafkaConsumer)
-		monkey.Unpatch(kafkacomm.GetKafkaProducer)
+		NewKafkaConsumer = originalNewKafkaConsumer
+		GetKafkaProducer = originalGetKafkaProducer
 	})
 }
 
 // Test to simulate the scenario where starting the Kafka producer fails
 func TestStartKafkaProducerFailure(t *testing.T) {
 	t.Run("Kafka producer creation failure", func(t *testing.T) {
-		// Monkey patch the NewKafkaConsumer function
-		monkey.Patch(kafkacomm.NewKafkaConsumer, func() (*kafkacomm.KafkaConsumer, error) {
-			fmt.Println("Monkey patched NewKafkaConsumer is called")
+		originalNewKafkaConsumer := NewKafkaConsumer
+		originalGetKafkaProducer := GetKafkaProducer
+		NewKafkaConsumer = func() (*kafkacomm.KafkaConsumer, error) {
 			return mockConsumer, nil
-		})
+		}
 
-		// Monkey patch the GetKafkaProducer function
-		monkey.Patch(kafkacomm.GetKafkaProducer, func(bootstrapServers, topic string) (*kafkacomm.KafkaProducer, error) {
-			fmt.Println("Monkey patched GetKafkaProducer is called")
+		GetKafkaProducer = func(bootstrapServers, topic string) (*kafkacomm.KafkaProducer, error) {
 			return nil, errors.New("Kafka producer creation error")
-		})
+		}
 
 		// Call the function under test
 		consumer, producer, err := startKafkaConsAndProd()
@@ -525,26 +628,23 @@ func TestStartKafkaProducerFailure(t *testing.T) {
 		assert.Nil(t, consumer)
 		assert.Nil(t, producer)
 
-		// Unpatch the functions
-		monkey.Unpatch(kafkacomm.NewKafkaConsumer)
-		monkey.Unpatch(kafkacomm.GetKafkaProducer)
+
+		NewKafkaConsumer = originalNewKafkaConsumer
+		GetKafkaProducer = originalGetKafkaProducer
 	})
 }
 
 // Test to verify that both the Kafka consumer and producer start successfully
 func TestStartKafkaAndProdSuccess(t *testing.T) {
 	t.Run("Kafka consumer and producer creation success", func(t *testing.T) {
-		// Monkey patch the NewKafkaConsumer function
-		monkey.Patch(kafkacomm.NewKafkaConsumer, func() (*kafkacomm.KafkaConsumer, error) {
-			fmt.Println("Monkey patched NewKafkaConsumer is called")
+		originalNewKafkaConsumer := NewKafkaConsumer
+		originalGetKafkaProducer := GetKafkaProducer
+		NewKafkaConsumer = func() (*kafkacomm.KafkaConsumer, error) {
 			return mockConsumer, nil
-		})
-
-		// Monkey patch the GetKafkaProducer function
-		monkey.Patch(kafkacomm.GetKafkaProducer, func(bootstrapServers, topic string) (*kafkacomm.KafkaProducer, error) {
-			fmt.Println("Monkey patched GetKafkaProducer is called")
+		}
+		GetKafkaProducer = func(bootstrapServers, topic string) (*kafkacomm.KafkaProducer, error) {
 			return mockProducer, nil
-		})
+		}
 
 		// Call the function under test
 		consumer, producer, err := startKafkaConsAndProd()
@@ -554,9 +654,8 @@ func TestStartKafkaAndProdSuccess(t *testing.T) {
 		assert.NotNil(t, consumer)
 		assert.NotNil(t, producer)
 
-		// Unpatch the functions
-		monkey.Unpatch(kafkacomm.NewKafkaConsumer)
-		monkey.Unpatch(kafkacomm.GetKafkaProducer)
+		NewKafkaConsumer = originalNewKafkaConsumer
+		GetKafkaProducer = originalGetKafkaProducer
 	})
 }
 
@@ -565,17 +664,17 @@ func TestHandleShutdownWithNilConsumer(t *testing.T) {
 	consts.SHUTDOWN_WAIT_TIME = 0
 	interruptChannel := make(chan os.Signal, 1)
 	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
 
+	defer cancel()
+        kafkaProducer := &kafkacomm.KafkaProducer{}
 	// Simulate sending an interrupt signal
 	go func() {
 		time.Sleep(500 * time.Millisecond)
 		interruptChannel <- os.Interrupt
 	}()
-
 	done := make(chan bool)
 	go func() {
-		handleShutdown(nil, interruptChannel, cancel) // Pass nil as kc
+		handleShutdown(nil, interruptChannel, cancel, kafkaProducer) // Pass nil as kc
 		done <- true
 	}()
 
@@ -604,11 +703,10 @@ func TestHandleMessages_ErrorInPdpMessageHandler(t *testing.T) {
 		Consumer: mockKafkaConsumer,
 	}
 
-	// Patch the PdpMessageHandler to return an error
-	patch := monkey.Patch(handler.PdpMessageHandler, func(ctx context.Context, kc *kafkacomm.KafkaConsumer, topic string, p publisher.PdpStatusSender) error {
+	originalPdpMessageHandler := PdpMessageHandler
+		PdpMessageHandler = func(ctx context.Context, kc *kafkacomm.KafkaConsumer, topic string, p publisher.PdpStatusSender) error {
 		return errors.New("simulated error in PdpMessageHandler")
-	})
-	defer patch.Unpatch()
+	}
 
 	// Call handleMessages
 	ctx := context.Background()
@@ -616,6 +714,8 @@ func TestHandleMessages_ErrorInPdpMessageHandler(t *testing.T) {
 
 	// No crash means the error branch was executed.
 	assert.True(t, true, "handleMessages executed successfully")
+	PdpMessageHandler := originalPdpMessageHandler
+	assert.NotNil(t, PdpMessageHandler)
 }
 
 // Test to verify the behavior when the HTTP server shutdown encounters errors.
@@ -623,11 +723,9 @@ func TestShutdownHTTPServer_Errors(t *testing.T) {
 	// Create a mock server
 	server := &http.Server{}
 
-	// Patch the Shutdown method to return an error
-	patch := monkey.PatchInstanceMethod(reflect.TypeOf(server), "Shutdown", func(_ *http.Server, _ context.Context) error {
+	ShutdownServ = func(server *http.Server, ctx context.Context) error {
 		return errors.New("shutdown error")
-	})
-	defer patch.Unpatch()
+	}
 
 	// Call the function
 	shutdownHTTPServer(server)
diff --git a/go.mod b/go.mod
index 25922e8..3aad533 100644
--- a/go.mod
+++ b/go.mod
@@ -3,14 +3,13 @@ module policy-opa-pdp
 go 1.23.3
 
 require (
-	bou.ke/monkey v1.0.2
 	github.com/confluentinc/confluent-kafka-go/v2 v2.8.0
-	github.com/go-playground/validator/v10 v10.24.0
+	github.com/go-playground/validator/v10 v10.25.0
 	github.com/google/uuid v1.6.0
 	github.com/oapi-codegen/runtime v1.1.1
-	github.com/open-policy-agent/opa v0.70.0
+	github.com/open-policy-agent/opa v1.1.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
@@ -18,16 +17,17 @@ require (
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
 	github.com/agnivade/levenshtein v1.2.0 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/containerd/containerd v1.7.23 // indirect
-	github.com/containerd/errdefs v0.3.0 // indirect
+	github.com/containerd/containerd v1.7.25 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -36,7 +36,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
-	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -49,24 +49,25 @@ require (
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/tchap/go-patricia/v2 v2.3.1 // indirect
+	github.com/tchap/go-patricia/v2 v2.3.2 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/yashtewari/glob-intersection v0.2.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
 	golang.org/x/crypto v0.32.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.7.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	oras.land/oras-go/v2 v2.3.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
diff --git a/go.sum b/go.sum
index ff0d9cd..3cf6296 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-bou.ke/monkey v1.0.2 h1:kWcnsrCNUatbxncxR/ThdYqbytgOIArtYWqcQLQzKLI=
-bou.ke/monkey v1.0.2/go.mod h1:OqickVX3tNx6t33n1xvtTtu85YN5s6cKwVug+oHMaIA=
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
@@ -16,10 +14,13 @@ github.com/Microsoft/hcsshim v0.11.7 h1:vl/nj3Bar/CvJSYo7gIQPyRWc9f3c6IeSNavBTSZ
 github.com/Microsoft/hcsshim v0.11.7/go.mod h1:MV8xMfmECjl5HdO7U/3/hFVnkmSBjAjmA09d4bExKcU=
 github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
 github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/agnivade/levenshtein v1.2.0 h1:U9L4IOT0Y3i0TIlUIDJ7rVUziKi/zPbrJGaFrtYH3SY=
 github.com/agnivade/levenshtein v1.2.0/go.mod h1:QVVI16kDrtSuwcpd0p1+xMC6Z/VfhtCyDIjcwga4/DU=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
 github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
 github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
@@ -50,14 +51,13 @@ github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
 github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
 github.com/buger/goterm v1.0.4 h1:Z9YvGmOih81P0FbVtEYTFF6YsSgxSUKEhf/f9bTMXbY=
 github.com/buger/goterm v1.0.4/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE=
 github.com/bytecodealliance/wasmtime-go/v3 v3.0.2 h1:3uZCA/BLTIu+DqCfguByNMJa2HVHpXvjfy0Dy7g6fuA=
 github.com/bytecodealliance/wasmtime-go/v3 v3.0.2/go.mod h1:RnUjnIXxEJcL6BgCvNyzCCRzZcxCgsZCi+RNlvYor5Q=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/compose-spec/compose-go/v2 v2.1.3 h1:bD67uqLuL/XgkAK6ir3xZvNLFPxPScEi1KW7R5esrLE=
@@ -68,14 +68,14 @@ github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaD
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
 github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
 github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
-github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ=
-github.com/containerd/containerd v1.7.23/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw=
-github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
-github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
-github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8=
-github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ=
-github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4=
-github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/containerd v1.7.25 h1:khEQOAXOEJalRO228yzVsuASLH42vT7DIo9Ss+9SMFQ=
+github.com/containerd/containerd v1.7.25/go.mod h1:tWfHzVI0azhw4CT2vaIjsb2CoV4LJ9PrMPaULAr21Ok=
+github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
+github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
+github.com/containerd/continuity v0.4.4 h1:/fNVfTJ7wIl/YPMHjf+5H32uFhl63JucB34PlCpMKII=
+github.com/containerd/continuity v0.4.4/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
@@ -90,10 +90,10 @@ github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHf
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgraph-io/badger/v3 v3.2103.5 h1:ylPa6qzbjYRQMU6jokoj4wzcaweHylt//CH0AKt0akg=
-github.com/dgraph-io/badger/v3 v3.2103.5/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw=
-github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
-github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
+github.com/dgraph-io/badger/v4 v4.5.1 h1:7DCIXrQjo1LKmM96YD+hLVJ2EEsyyoWxJfpdd56HLps=
+github.com/dgraph-io/badger/v4 v4.5.1/go.mod h1:qn3Be0j3TfV4kPbVoK0arXCD1/nr1ftth6sbL5jxdoA=
+github.com/dgraph-io/ristretto/v2 v2.1.0 h1:59LjpOJLNDULHh8MC4UaegN52lC4JnO2dITsie/Pa8I=
+github.com/dgraph-io/ristretto/v2 v2.1.0/go.mod h1:uejeqfYXpUomfse0+lO+13ATz4TypQYLJZzBSAemuB4=
 github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54 h1:SG7nF6SRlWhcT7cNTs5R6Hk4V2lcmLz2NsG2VnInyNo=
 github.com/dgryski/trifles v0.0.0-20230903005119-f50d829f2e54/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
@@ -118,8 +118,8 @@ github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQ
 github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 h1:XBBHcIb256gUJtLmY22n99HaZTz+r2Z51xUPi01m3wg=
 github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203/go.mod h1:E1jcSv8FaEny+OP/5k9UxZVw9YFWGj7eI4KR/iOBqCg=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
@@ -132,8 +132,8 @@ github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7Dlme
 github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
 github.com/fsnotify/fsevents v0.2.0 h1:BRlvlqjvNTfogHfeBOFvSC9N0Ddy+wzQCQukyoD7o/c=
 github.com/fsnotify/fsevents v0.2.0/go.mod h1:B3eEk39i4hz8y1zaWS/wPrAP4O6wkIl7HQwKBr1qH/w=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/fvbommel/sortorder v1.0.2 h1:mV4o8B2hKboCdkJm+a7uX/SIpZob4JzUpc5GGnM45eo=
 github.com/fvbommel/sortorder v1.0.2/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
@@ -159,8 +159,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg=
-github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
+github.com/go-playground/validator/v10 v10.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8=
+github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
 github.com/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc=
 github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -171,16 +171,12 @@ github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0
 github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=
-github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/flatbuffers v1.12.1 h1:MVlul7pQNoDzWRLTw5imwYsl+usrS1TXG2H4jg6ImGw=
-github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/flatbuffers v24.12.23+incompatible h1:ubBKR94NR4pXUCY/MUsRVzd9umNW7ht7EG9hHfS9FX8=
+github.com/google/flatbuffers v24.12.23+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
 github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -196,8 +192,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
@@ -218,10 +214,11 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -288,8 +285,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro=
 github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
-github.com/open-policy-agent/opa v0.70.0 h1:B3cqCN2iQAyKxK6+GI+N40uqkin+wzIrM7YA60t9x1U=
-github.com/open-policy-agent/opa v0.70.0/go.mod h1:Y/nm5NY0BX0BqjBriKUiV81sCl8XOjjvqQG7dXrggtI=
+github.com/open-policy-agent/opa v1.1.0 h1:HMz2evdEMTyNqtdLjmu3Vyx06BmhNYAx67Yz3Ll9q2s=
+github.com/open-policy-agent/opa v1.1.0/go.mod h1:T1pASQ1/vwfTa+e2fYcfpLCvWgYtqtiUv+IuA/dLPQs=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
@@ -316,8 +313,8 @@ github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo
 github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/secure-systems-lab/go-securesystemslib v0.4.0 h1:b23VGrQhTA8cN2CbBw7/FulN9fTtqYUdS5+Oxzt+DUE=
 github.com/secure-systems-lab/go-securesystemslib v0.4.0/go.mod h1:FGBZgq2tXWICsxWQW1msNf49F0Pf2Op5Htayx335Qbs=
 github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b h1:h+3JX2VoWTFuyQEo87pStk/a99dzIO1mM9KxIyLPGTU=
@@ -336,14 +333,16 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
 github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tchap/go-patricia/v2 v2.3.1 h1:6rQp39lgIYZ+MHmdEq4xzuk1t7OdC35z/xm0BGhTkes=
-github.com/tchap/go-patricia/v2 v2.3.1/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/tchap/go-patricia/v2 v2.3.2 h1:xTHFutuitO2zqKAQ5rCROYgUb7Or/+IC3fts9/Yc7nM=
+github.com/tchap/go-patricia/v2 v2.3.2/go.mod h1:VZRHKAb53DLaG+nA9EaYYiaEx6YztwDlLElMsnSHD4k=
 github.com/testcontainers/testcontainers-go v0.33.0 h1:zJS9PfXYT5O0ZFXM2xxXfk4J5UMw/kRiISng037Gxdw=
 github.com/testcontainers/testcontainers-go v0.33.0/go.mod h1:W80YpTa8D5C3Yy16icheD01UTDu+LmXIA2Keo+jWtT8=
 github.com/testcontainers/testcontainers-go/modules/compose v0.33.0 h1:PyrUOF+zG+xrS3p+FesyVxMI+9U+7pwhZhyFozH3jKY=
@@ -374,48 +373,50 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi
 github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
 go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 h1:gbhw/u49SS3gkPWiYweQNJGm/uJN5GkI/FrosxSHT7A=
 go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1/go.mod h1:GnOaBaFQ2we3b9AGWJpsBa7v1S5RlQzlC3O7dRMxZhM=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
-go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
-go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 h1:ZtfnDL+tUrs1F0Pzfwbg2d59Gru9NCH3bgSHBM6LDwU=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 h1:NmnYCiR0qNufkldjVvyQfZTHSdzeHoZ41zggMsdMcLM=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0/go.mod h1:UVAO61+umUsHLtYb8KXXRoHtxUkdOPkYidzW3gipRLQ=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 h1:wNMDy/LVGLj2h3p6zg4d0gypKfWKSWI14E1C4smOgl8=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0/go.mod h1:YfbDdXAAkemWJK3H/DshvlrxqFB2rtW4rY6ky/3x/H0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I=
-go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
-go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
-go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE=
-go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg=
-go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0=
-go.opentelemetry.io/otel/sdk/metric v1.21.0/go.mod h1:FJ8RAsoPGv/wYMgBdUJXOm+6pzFY3YdljnXtv1SBE8Q=
-go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
-go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
-go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
-go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU=
+go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
 go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
 go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
 golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o=
 golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
-golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE=
+golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -425,20 +426,20 @@ golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
 golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
-golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
+golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa h1:ePqxpG3LVx+feAUOx8YmR5T7rc0rdzK8DyxM8cQ9zq0=
 google.golang.org/genproto v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:CnZenrTdRJb7jc+jOm0Rkywq+9wh0QC4U8tyiRbEPPM=
-google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:wKguEg1hsxI2/L3hUYrpo1RVi48K+uTyzKqprwLXsb8=
-google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA=
+google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
+google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
+google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y=
 gopkg.in/cenkalti/backoff.v1 v1.1.0/go.mod h1:J6Vskwqd+OMVJl8C33mmtxTBs2gyzfv7UDAkHu8BrjI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/pkg/data/data-handler.go b/pkg/data/data-handler.go
new file mode 100644
index 0000000..b571010
--- /dev/null
+++ b/pkg/data/data-handler.go
@@ -0,0 +1,426 @@
+// -
+//
+//	========================LICENSE_START=================================
+//	Copyright (C) 2025: Deutsche Telekom
+//
+//	Licensed under the Apache License, Version 2.0 (the "License");
+//	you may not use this file except in compliance with the License.
+//	You may obtain a copy of the License at
+//
+//	     http://www.apache.org/licenses/LICENSE-2.0
+//
+//	Unless required by applicable law or agreed to in writing, software
+//	distributed under the License is distributed on an "AS IS" BASIS,
+//	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//	See the License for the specific language governing permissions and
+//	limitations under the License.
+//	SPDX-License-Identifier: Apache-2.0
+//	========================LICENSE_END===================================
+package data
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/google/uuid"
+	openapi_types "github.com/oapi-codegen/runtime/types"
+	"net/http"
+	"path/filepath"
+	"policy-opa-pdp/consts"
+	"policy-opa-pdp/pkg/log"
+	"policy-opa-pdp/pkg/metrics"
+	"policy-opa-pdp/pkg/model/oapicodegen"
+	"policy-opa-pdp/pkg/opasdk"
+	"policy-opa-pdp/pkg/utils"
+	"strings"
+
+	"github.com/open-policy-agent/opa/storage"
+	"policy-opa-pdp/pkg/policymap"
+)
+
+var (
+	addOp     storage.PatchOp = 0
+	removeOp  storage.PatchOp = 1
+	replaceOp storage.PatchOp = 2
+)
+
+// creates a response code map to OPADataUpdateResponse
+var httpToOPADataUpdateResponseCode = map[int]oapicodegen.ErrorResponseResponseCode{
+	400: oapicodegen.InvalidParameter,
+	401: oapicodegen.Unauthorized,
+	500: oapicodegen.InternalError,
+	404: oapicodegen.ResourceNotFound,
+}
+
+// Gets responsecode from map
+func getErrorResponseCodeForOPADataUpdate(httpStatus int) oapicodegen.ErrorResponseResponseCode {
+	if code, exists := httpToOPADataUpdateResponseCode[httpStatus]; exists {
+		return code
+	}
+	return oapicodegen.InternalError
+}
+
+// writes a Error JSON response to the HTTP response writer for OPADataUpdate
+func writeOPADataUpdateErrorJSONResponse(res http.ResponseWriter, status int, errorDescription string, dataErrorRes oapicodegen.ErrorResponse) {
+	res.Header().Set("Content-Type", "application/json")
+	res.WriteHeader(status)
+	if err := json.NewEncoder(res).Encode(dataErrorRes); err != nil {
+		http.Error(res, err.Error(), status)
+	}
+}
+
+// creates a OPADataUpdate response based on the provided parameters
+func createOPADataUpdateExceptionResponse(statusCode int, errorMessage string, policyName string) *oapicodegen.ErrorResponse {
+	responseCode := getErrorResponseCodeForOPADataUpdate(statusCode)
+	return &oapicodegen.ErrorResponse{
+		ResponseCode: (*oapicodegen.ErrorResponseResponseCode)(&responseCode),
+		ErrorMessage: &errorMessage,
+		PolicyName:   &policyName,
+	}
+}
+
+// Validate OPADataUpdateRequest function
+func validateOPADataUpdateRequest(request *oapicodegen.OPADataUpdateRequest) []string {
+	var validationErrors []string
+
+	// Check if required fields are populated
+	dateString := (request.CurrentDate).String()
+	if !(utils.IsValidCurrentDate(&dateString)) {
+		validationErrors = append(validationErrors, "CurrentDate is required")
+	}
+
+	// Validate CurrentDateTime format
+	if !(utils.IsValidTime(request.CurrentDateTime)) {
+		validationErrors = append(validationErrors, "CurrentDateTime is invalid or missing")
+	}
+
+	// Validate CurrentTime format
+	if !(utils.IsValidCurrentTime(request.CurrentTime)) {
+		validationErrors = append(validationErrors, "CurrentTime is invalid or missing")
+	}
+
+	// Validate Data field (ensure it's not nil and has items)
+	if !(utils.IsValidData(request.Data)) {
+		validationErrors = append(validationErrors, "Data is required and cannot be empty")
+	}
+
+	// Validate TimeOffset format (e.g., +02:00 or -05:00)
+	if !(utils.IsValidTimeOffset(request.TimeOffset)) {
+		validationErrors = append(validationErrors, "TimeOffset is invalid or missing")
+	}
+
+	// Validate TimeZone format (e.g., 'America/New_York')
+	if !(utils.IsValidTimeZone(request.TimeZone)) {
+		validationErrors = append(validationErrors, "TimeZone is invalid or missing")
+	}
+
+	// Optionally, check if 'OnapComponent', 'OnapInstance', 'OnapName', and 'PolicyName' are provided
+	if !(utils.IsValidString(request.OnapComponent)) {
+		validationErrors = append(validationErrors, "OnapComponent is required")
+	}
+
+	if !(utils.IsValidString(request.OnapInstance)) {
+		validationErrors = append(validationErrors, "OnapInstance is required")
+	}
+
+	if !(utils.IsValidString(request.OnapName)) {
+		validationErrors = append(validationErrors, "OnapName is required")
+	}
+
+	if !(utils.IsValidString(request.PolicyName)) {
+		validationErrors = append(validationErrors, "PolicyName is required and cannot be empty")
+	}
+
+	// Return all validation errors (if any)
+	return validationErrors
+}
+
+func patchHandler(res http.ResponseWriter, req *http.Request) {
+	log.Infof("PDP received a request to update data through API")
+	constructResponseHeader(res, req)
+	var requestBody oapicodegen.OPADataUpdateRequest
+	if err := json.NewDecoder(req.Body).Decode(&requestBody); err != nil {
+		errMsg := "Error in decoding the request data - " + err.Error()
+		sendErrorResponse(res, errMsg, http.StatusBadRequest)
+		log.Errorf(errMsg)
+		return
+	}
+	path := strings.TrimPrefix(req.URL.Path, "/policy/pdpo/v1/data/")
+	dirParts := strings.Split(path, "/")
+	dataDir := filepath.Join(dirParts...)
+	log.Infof("dataDir : %s", dataDir)
+
+	// Validate the request
+	validationErrors := validateOPADataUpdateRequest(&requestBody)
+
+	// Print validation errors
+	if len(validationErrors) > 0 {
+		errMsg := strings.Join(validationErrors, ", ")
+		log.Errorf("Facing validation error in requestbody - %s", errMsg)
+		sendErrorResponse(res, errMsg, http.StatusBadRequest)
+		return
+	} else {
+		log.Errorf("All fields are valid!")
+		// Access the data part
+		data := requestBody.Data
+		log.Infof("data : %s", data)
+		policyId := requestBody.PolicyName
+		log.Infof("policy name : %s", *policyId)
+		isExists := policymap.CheckIfPolicyAlreadyExists(*policyId)
+		if !isExists {
+			errMsg := "Policy associated with the patch request does not exists"
+			sendErrorResponse(res, errMsg, http.StatusBadRequest)
+			log.Errorf(errMsg)
+			return
+		}
+		if err := patchData(dataDir, data, res); err != nil {
+                        // Handle the error, for example, log it or return an appropriate response
+                        log.Errorf("Error encoding JSON response: %s", err)
+                }
+	}
+}
+
+func DataHandler(res http.ResponseWriter, req *http.Request) {
+	reqMethod := req.Method
+	switch reqMethod {
+	case "PATCH":
+		patchHandler(res, req)
+	case "GET":
+		getDataInfo(res, req)
+	default:
+		invalidMethodHandler(res, reqMethod)
+	}
+}
+
+func extractPatchInfo(res http.ResponseWriter, ops *[]map[string]interface{}, root string) (result []opasdk.PatchImpl) {
+	for _, op := range *ops {
+		// Extract the operation, path, and value from the map
+		optypeString, opTypeErr := op["op"].(string)
+		if !opTypeErr {
+			opTypeErrMsg := "Error in getting op type. Op type is not given in request body"
+			sendErrorResponse(res, opTypeErrMsg, http.StatusInternalServerError)
+			log.Errorf(opTypeErrMsg)
+			return nil
+		}
+		opType := getOperationType(optypeString, res)
+
+		if opType == nil {
+			return nil
+		}
+		impl := opasdk.PatchImpl{
+			Op: *opType,
+		}
+
+		var value interface{}
+		var valueErr bool
+		// PATCH request with add or replace opType, MUST contain a "value" member whose content specifies the value to be added / replaced. For remove opType, value does not required
+		if optypeString == "add" || optypeString == "replace" {
+			value, valueErr = op["value"]
+			if !valueErr {
+				valueErrMsg := "Error in getting data value. Value is not given in request body"
+				sendErrorResponse(res, valueErrMsg, http.StatusInternalServerError)
+				log.Errorf(valueErrMsg)
+				return nil
+			}
+		}
+		impl.Value = value
+
+		opPath, opPathErr := op["path"].(string)
+		if !opPathErr {
+			opPathErrMsg := "Error in getting data path. Path is not given in request body"
+			sendErrorResponse(res, opPathErrMsg, http.StatusInternalServerError)
+			log.Errorf(opPathErrMsg)
+			return nil
+		}
+		storagePath := constructPath(opPath, optypeString, root, res)
+		if storagePath == nil {
+			return nil
+		}
+		impl.Path = storagePath
+
+		result = append(result, impl)
+	}
+	//log.Debugf("result : %s", result)
+	return result
+}
+
+func constructPath(opPath string, opType string, root string, res http.ResponseWriter) (storagePath storage.Path) {
+	// Construct patch path.
+	log.Debugf("root: %s", root)
+
+	path := strings.Trim(opPath, "/")
+	log.Debugf("path : %s", path)
+	/*
+		Eg: 1
+		path in curl = v1/data/test
+		path in request body = /test1
+		consolidated path = /test/test1
+		so, value should be updated under /test/test1
+
+		Eg: 2
+		path in curl = v1/data/
+		path in request body = /test1
+		consolidated path = /test1
+		so, value should be updated under /test1
+	*/
+	if len(path) > 0 {
+		if root == "/" {
+			path = root + path
+		} else {
+			path = root + "/" + path
+		}
+	} else {
+		if opType == "remove" {
+			valueErrMsg := "Error in getting data path - Invalid path (/) is used."
+			sendErrorResponse(res, valueErrMsg, http.StatusInternalServerError)
+			log.Errorf(valueErrMsg)
+			return nil
+		}
+		path = root
+	}
+
+	log.Infof("calling ParsePatchPathEscaped to check the path")
+	storagePath, ok := opasdk.ParsePatchPathEscaped(path)
+
+	if !ok {
+		valueErrMsg := "Error in checking patch path - Bad patch path used :" + path
+		sendErrorResponse(res, valueErrMsg, http.StatusInternalServerError)
+		log.Errorf(valueErrMsg)
+		return nil
+	}
+
+	return storagePath
+}
+
+func getOperationType(opType string, res http.ResponseWriter) *storage.PatchOp {
+	var op *storage.PatchOp
+	switch opType {
+	case "add":
+		op = &addOp
+	case "remove":
+		op = &removeOp
+	case "replace":
+		op = &replaceOp
+	default:
+		{
+			errMsg := "Error in getting op type : Invalid operation type (" + opType + ") is used. Only add, remove and replace operation types are supported"
+			sendErrorResponse(res, errMsg, http.StatusBadRequest)
+			log.Errorf(errMsg)
+			return nil
+		}
+	}
+	return op
+}
+
+type NewOpaSDKPatchFunc func(ctx context.Context, patches []opasdk.PatchImpl) error
+
+var NewOpaSDKPatch NewOpaSDKPatchFunc = opasdk.PatchData
+
+func patchData(root string, ops *[]map[string]interface{}, res http.ResponseWriter) (err error) {
+	root = "/" + strings.Trim(root, "/")
+	patchInfos := extractPatchInfo(res, ops, root)
+
+	if patchInfos != nil {
+		patchErr := NewOpaSDKPatch(context.Background(), patchInfos)
+		if patchErr != nil {
+			errCode := http.StatusInternalServerError
+
+			if strings.Contains((patchErr.Error()), "storage_not_found_error") {
+				errCode = http.StatusNotFound
+			}
+			errMsg := "Error in updating data - " + patchErr.Error()
+			sendErrorResponse(res, errMsg, errCode)
+			log.Errorf(errMsg)
+			return
+		}
+		log.Infof("Updated the data in the corresponding path successfully\n")
+		res.WriteHeader(http.StatusNoContent)
+	}
+	// handled all error scenarios in extractPatchInfo method
+	return nil
+}
+
+func sendErrorResponse(res http.ResponseWriter, errMsg string, statusCode int) {
+	dataExc := createOPADataUpdateExceptionResponse(statusCode, errMsg, "")
+	metrics.IncrementTotalErrorCount()
+	writeOPADataUpdateErrorJSONResponse(res, statusCode, errMsg, *dataExc)
+}
+
+func invalidMethodHandler(res http.ResponseWriter, method string) {
+	log.Errorf("Invalid method type")
+	resMsg := "Only PATCH and GET Method Allowed"
+	msg := "MethodNotAllowed"
+	sendErrorResponse(res, (method + msg + " - " + resMsg), http.StatusBadRequest)
+	log.Errorf(method + msg + " - " + resMsg)
+	return
+}
+
+func constructResponseHeader(res http.ResponseWriter, req *http.Request) {
+	requestId := req.Header.Get("X-ONAP-RequestID")
+	var parsedUUID *uuid.UUID
+	var decisionParams *oapicodegen.DecisionParams
+
+	if requestId != "" && utils.IsValidUUID(requestId) {
+		tempUUID, err := uuid.Parse(requestId)
+		if err != nil {
+			log.Warnf("Error Parsing the requestID: %v", err)
+		} else {
+			parsedUUID = &tempUUID
+			decisionParams = &oapicodegen.DecisionParams{
+				XONAPRequestID: (*openapi_types.UUID)(parsedUUID),
+			}
+			res.Header().Set("X-ONAP-RequestID", decisionParams.XONAPRequestID.String())
+		}
+	} else {
+		requestId = "Unknown"
+		res.Header().Set("X-ONAP-RequestID", requestId)
+	}
+
+	res.Header().Set("X-LatestVersion", consts.LatestVersion)
+	res.Header().Set("X-PatchVersion", consts.PatchVersion)
+	res.Header().Set("X-MinorVersion", consts.MinorVersion)
+}
+
+func getDataInfo(res http.ResponseWriter, req *http.Request) {
+	log.Infof("PDP received a request to get data through API")
+
+	constructResponseHeader(res, req)
+
+	urlPath := req.URL.Path
+	dataPath := strings.ReplaceAll(urlPath, "/policy/pdpo/v1/data", "")
+	log.Debugf("datapath to get Data : %s\n", dataPath)
+
+	getData(res, dataPath)
+}
+
+type NewOpaSDKGetFunc func(ctx context.Context, dataPath string) (data *oapicodegen.OPADataResponse_Data, err error)
+
+var NewOpaSDK NewOpaSDKGetFunc = opasdk.GetDataInfo
+
+func getData(res http.ResponseWriter, dataPath string) {
+
+	var dataResponse oapicodegen.OPADataResponse
+	data, getErr := NewOpaSDK(context.Background(), dataPath)
+	if getErr != nil {
+		errCode := http.StatusInternalServerError
+
+		if strings.Contains((getErr.Error()), "storage_not_found_error") {
+			errCode = http.StatusNotFound
+		}
+
+		sendErrorResponse(res, "Error in getting data - "+getErr.Error(), errCode)
+		log.Errorf("Error in getting data - %s ", getErr.Error())
+		return
+	}
+
+	if data != nil {
+		dataResponse.Data = data
+	}
+
+	res.Header().Set("Content-Type", "application/json")
+	res.WriteHeader(http.StatusOK)
+
+	if err := json.NewEncoder(res).Encode(dataResponse); err != nil {
+                // Handle the error, for example, log it or return an appropriate response
+                log.Errorf("Error encoding JSON response: %s", err)
+	}
+}
diff --git a/pkg/data/data-handler_test.go b/pkg/data/data-handler_test.go
new file mode 100644
index 0000000..41be361
--- /dev/null
+++ b/pkg/data/data-handler_test.go
@@ -0,0 +1,513 @@
+// -
+//
+//	========================LICENSE_START=================================
+//	Copyright (C) 2025: Deutsche Telekom
+//
+//	Licensed under the Apache License, Version 2.0 (the "License");
+//	you may not use this file except in compliance with the License.
+//	You may obtain a copy of the License at
+//
+//	     http://www.apache.org/licenses/LICENSE-2.0
+//
+//	Unless required by applicable law or agreed to in writing, software
+//	distributed under the License is distributed on an "AS IS" BASIS,
+//	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//	See the License for the specific language governing permissions and
+//	limitations under the License.
+//	SPDX-License-Identifier: Apache-2.0
+//	========================LICENSE_END===================================
+package data
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	openapi_types "github.com/oapi-codegen/runtime/types"
+	"github.com/stretchr/testify/assert"
+	"net/http"
+	"net/http/httptest"
+	"policy-opa-pdp/pkg/model/oapicodegen"
+	"policy-opa-pdp/pkg/opasdk"
+	"strings"
+	"testing"
+	"time"
+)
+
+func TestGetErrorResponseCodeForOPADataUpdate(t *testing.T) {
+	tests := []struct {
+		name     string
+		input    int
+		expected oapicodegen.ErrorResponseResponseCode
+	}{
+		{"Invalid Parameter", 400, oapicodegen.InvalidParameter},
+		{"Unauthorized", 401, oapicodegen.Unauthorized},
+		{"Internal Error", 500, oapicodegen.InternalError},
+		{"Resource Not Found", 404, oapicodegen.ResourceNotFound},
+		{"Unknown Error", 999, oapicodegen.InternalError},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getErrorResponseCodeForOPADataUpdate(tt.input)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestValidateOPADataUpdateRequest(t *testing.T) {
+	ctime := "12:00:00"
+	timeZone := "America_New_York"
+	timeOffset := "$02:00"
+	onapComp := " "
+	onapIns := " "
+	onapName := " "
+	policyName := " "
+	var currentDate openapi_types.Date
+	currentDate = openapi_types.Date{}
+	var currentDateTime time.Time
+	currentDateTime = time.Time{}
+
+	var data []map[string]interface{}
+
+	data = nil
+
+	inValidRequest := &oapicodegen.OPADataUpdateRequest{
+		CurrentDate:     &currentDate,
+		CurrentDateTime: &currentDateTime,
+		CurrentTime:     &ctime,
+		TimeOffset:      &timeOffset,
+		TimeZone:        &timeZone,
+		OnapComponent:   &onapComp,
+		OnapInstance:    &onapIns,
+		OnapName:        &onapName,
+		PolicyName:      &policyName,
+		Data:            &data,
+	}
+
+	inValidErr := []string{"CurrentTime is invalid or missing", "Data is required and cannot be empty", "TimeOffset is invalid or missing", "TimeZone is invalid or missing", "OnapComponent is required", "OnapInstance is required", "OnapName is required", "PolicyName is required and cannot be empty"}
+
+	tests := []struct {
+		name        string
+		request     *oapicodegen.OPADataUpdateRequest
+		expectedErr []string
+	}{
+		{"Valid Request", inValidRequest, inValidErr},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			errors := validateOPADataUpdateRequest(tt.request)
+			fmt.Printf("error : %s", errors)
+			fmt.Printf("error len : %d", len(errors))
+			assert.Equal(t, tt.expectedErr, errors)
+		})
+	}
+}
+
+func TestPatchHandler_InvalidJSON(t *testing.T) {
+	req := httptest.NewRequest("PATCH", "/policy/pdpo/v1/data/", bytes.NewBuffer([]byte("{invalid_json}")))
+	res := httptest.NewRecorder()
+
+	patchHandler(res, req)
+
+	assert.Equal(t, http.StatusBadRequest, res.Code)
+	assert.Contains(t, res.Body.String(), "Error in decoding")
+}
+
+func TestPatchHandlerWithInvalidData(t *testing.T) {
+	ctime := "08:26:41"
+	timeZone := "America/New_York"
+	timeOffset := "+02:00"
+	onapComp := "COMPONENT"
+	onapIns := "INSTANCE"
+	onapName := "ONAP"
+	policyName := "TestPolicy"
+	parsedDate, err := time.Parse("2006-01-02", "2024-02-12")
+	if err != nil {
+		fmt.Println("error in parsedDate")
+	}
+	currentDate := openapi_types.Date{Time: parsedDate}
+	currentDateTime, err := time.Parse(time.RFC3339, "2024-02-12T12:00:00Z")
+	if err != nil {
+		fmt.Println("error in currentDateTime")
+	}
+	var data []map[string]interface{}
+
+	data = append(data, map[string]interface{}{"key": "value"})
+
+	validRequest := &oapicodegen.OPADataUpdateRequest{
+		CurrentDate:     &currentDate,
+		CurrentDateTime: &currentDateTime,
+		CurrentTime:     &ctime,
+		TimeOffset:      &timeOffset,
+		TimeZone:        &timeZone,
+		OnapComponent:   &onapComp,
+		OnapInstance:    &onapIns,
+		OnapName:        &onapName,
+		PolicyName:      &policyName,
+		Data:            &data,
+	}
+
+	// Marshal the request to JSON
+	requestBody, err := json.Marshal(validRequest)
+	if err != nil {
+		panic(err)
+	}
+
+	req := httptest.NewRequest("PATCH", "/policy/pdpo/v1/data/valid/path", bytes.NewReader(requestBody))
+	res := httptest.NewRecorder()
+	patchHandler(res, req)
+	assert.Equal(t, http.StatusBadRequest, res.Code)
+}
+
+func TestPatchHandlerWithInvalidPolicyId(t *testing.T) {
+	ctime := "08:26:41.857Z"
+	timeZone := "America/New_York"
+	timeOffset := "+02:00"
+	onapComp := "COMPONENT"
+	onapIns := "INSTANCE"
+	onapName := "ONAP"
+	policyName := "TestPolicy"
+	parsedDate, err := time.Parse("2006-01-02", "2024-02-12")
+	if err != nil {
+		fmt.Println("error in parsedDate")
+	}
+	currentDate := openapi_types.Date{Time: parsedDate}
+	currentDateTime, err := time.Parse(time.RFC3339, "2024-02-12T12:00:00Z")
+	if err != nil {
+		fmt.Println("error in currentDateTime")
+	}
+	var data []map[string]interface{}
+
+	data = append(data, map[string]interface{}{"key": "value"})
+
+	validRequest := &oapicodegen.OPADataUpdateRequest{
+		CurrentDate:     &currentDate,
+		CurrentDateTime: &currentDateTime,
+		CurrentTime:     &ctime,
+		TimeOffset:      &timeOffset,
+		TimeZone:        &timeZone,
+		OnapComponent:   &onapComp,
+		OnapInstance:    &onapIns,
+		OnapName:        &onapName,
+		PolicyName:      &policyName,
+		Data:            &data,
+	}
+	// Marshal the request to JSON
+	requestBody, err := json.Marshal(validRequest)
+	if err != nil {
+		panic(err)
+	}
+
+	req := httptest.NewRequest("PATCH", "/policy/pdpo/v1/data/valid/path", bytes.NewReader(requestBody))
+	res := httptest.NewRecorder()
+
+	patchHandler(res, req)
+
+	assert.Equal(t, http.StatusBadRequest, res.Code)
+}
+
+func TestPatchData_failure(t *testing.T) {
+	var data []map[string]interface{}
+
+	data = nil
+	root := "/test"
+	res := httptest.NewRecorder()
+	result := patchData(root, &data, res)
+	assert.Nil(t, result)
+}
+
+func TestPatchData_storageFail(t *testing.T) {
+	// Backup original function
+	originalOpaSDKPatchData := NewOpaSDKPatch
+	NewOpaSDKPatch = func(ctx context.Context, patches []opasdk.PatchImpl) error {
+		return errors.New("storage_not_found_error")
+	}
+	defer func() { NewOpaSDKPatch = originalOpaSDKPatchData }() // Restore after test
+	var data []map[string]interface{}
+	data = append(data, map[string]interface{}{"op": "add", "path": "/test", "value": "try"})
+
+	root := "/test"
+	res := httptest.NewRecorder()
+	result := patchData(root, &data, res)
+	assert.Equal(t, http.StatusNotFound, res.Code)
+	assert.Nil(t, result)
+}
+
+func Test_extractPatchInfo_OPTypefail(t *testing.T) {
+	var data []map[string]interface{}
+	data = append(data, map[string]interface{}{"path": "/test", "value": "try"})
+
+	root := "/test"
+	res := httptest.NewRecorder()
+	extractPatchInfo(res, &data, root)
+	assert.Equal(t, http.StatusInternalServerError, res.Code)
+}
+
+func Test_extractPatchInfo_Pathfail(t *testing.T) {
+	var data []map[string]interface{}
+	data = append(data, map[string]interface{}{"op": "add", "value": "try"})
+
+	root := "/test"
+	res := httptest.NewRecorder()
+	extractPatchInfo(res, &data, root)
+	assert.Equal(t, http.StatusInternalServerError, res.Code)
+}
+
+func Test_extractPatchInfo_valuefail(t *testing.T) {
+	var data []map[string]interface{}
+	data = append(data, map[string]interface{}{"path": "/test", "op": "add"})
+
+	root := "/test"
+	res := httptest.NewRecorder()
+	extractPatchInfo(res, &data, root)
+	assert.Equal(t, http.StatusInternalServerError, res.Code)
+}
+
+func TestPatchData_success(t *testing.T) {
+	// Backup original function
+	originalOpaSDKPatchData := NewOpaSDKPatch
+	NewOpaSDKPatch = func(ctx context.Context, patches []opasdk.PatchImpl) error {
+		return nil
+	}
+	defer func() { NewOpaSDKPatch = originalOpaSDKPatchData }() // Restore after test
+	var data []map[string]interface{}
+	data = append(data, map[string]interface{}{"op": "add", "path": "/test", "value": "try"})
+
+	root := "/test"
+	res := httptest.NewRecorder()
+	patchData(root, &data, res)
+	assert.Equal(t, http.StatusNoContent, res.Code)
+}
+
+func TestConstructPath(t *testing.T) {
+	tests := []struct {
+		name       string
+		opPath     string
+		opType     string
+		root       string
+		expectsNil bool
+	}{
+		{"Valid Path", "/test1", "add", "/v1/data", false},
+		{"Invalid Remove Path", "/", "remove", "/v1/data", true},
+		{"Invalid empty Path", "", "add", "", true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			res := httptest.NewRecorder()
+			result := constructPath(tt.opPath, tt.opType, tt.root, res)
+			if tt.expectsNil {
+				assert.Nil(t, result)
+			} else {
+				assert.NotNil(t, result)
+			}
+		})
+	}
+}
+
+func TestGetOperationType(t *testing.T) {
+	tests := []struct {
+		name       string
+		opType     string
+		expectsNil bool
+	}{
+		{"Valid opType", "add", false},
+		{"Valid opType", "remove", false},
+		{"Valid opType", "replace", false},
+		{"Invalid opType", "try", true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			res := httptest.NewRecorder()
+			result := getOperationType(tt.opType, res)
+			if tt.expectsNil {
+				assert.Nil(t, result)
+			} else {
+				assert.NotNil(t, result)
+			}
+		})
+	}
+}
+
+// Test to check UUID is valid
+func Test_valid_UUID(t *testing.T) {
+	req := httptest.NewRequest("PATCH", "/policy/pdpo/v1/data/missing/path", nil)
+	req.Header.Set("X-ONAP-RequestID", "123e4567-e89b-12d3-a456-426614174000")
+	res := httptest.NewRecorder()
+	DataHandler(res, req)
+	assert.Equal(t, "123e4567-e89b-12d3-a456-426614174000", res.Header().Get("X-ONAP-RequestID"), "X-ONAP-RequestID header mismatch")
+}
+
+// Test to check UUID is in-valid
+func Test_inValid_UUID(t *testing.T) {
+	req := httptest.NewRequest("PATCH", "/policy/pdpo/v1/data/missing/path", nil)
+	req.Header.Set("X-ONAP-RequestID", "invalid-uuid")
+	res := httptest.NewRecorder()
+	DataHandler(res, req)
+	assert.Equal(t, http.StatusBadRequest, res.Code)
+}
+
+func TestDataHandler(t *testing.T) {
+	tests := []struct {
+		name           string
+		method         string
+		expectedStatus int
+	}{
+		{
+			name:           "Invalid method",
+			method:         "POST", // assuming the handler doesn't handle POST
+			expectedStatus: http.StatusBadRequest,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Create a request with the given method
+			req := httptest.NewRequest(tt.method, "/policy/pdpo/v1/data/mismatch/path", nil)
+
+			// Create a ResponseRecorder to record the response
+			res := httptest.NewRecorder()
+
+			// Call the DataHandler with the mock request and recorder
+			DataHandler(res, req)
+
+			// Check if the response status code matches the expected status
+			if res.Code != tt.expectedStatus {
+				t.Errorf("expected status %v, got %v", tt.expectedStatus, res.Code)
+			}
+		})
+	}
+}
+
+func TestSendErrorResponse(t *testing.T) {
+	res := httptest.NewRecorder()
+	sendErrorResponse(res, "Test Error", http.StatusBadRequest)
+
+	assert.Equal(t, http.StatusBadRequest, res.Code)
+	assert.Contains(t, res.Body.String(), "Test Error")
+}
+
+func TestInvalidMethodHandler(t *testing.T) {
+	res := httptest.NewRecorder()
+	invalidMethodHandler(res, "POST")
+
+	assert.Equal(t, http.StatusBadRequest, res.Code)
+	assert.Contains(t, res.Body.String(), "Only PATCH and GET Method Allowed")
+}
+
+func TestGetDataInfo(t *testing.T) {
+	// Backup original function
+	originalOpaSDKGetDataInfo := NewOpaSDK
+	NewOpaSDK = func(ctx context.Context, dataPath string) (data *oapicodegen.OPADataResponse_Data, err error) {
+		return nil, errors.New("storage_not_found_error")
+	}
+	defer func() { NewOpaSDK = originalOpaSDKGetDataInfo }() // Restore after test
+
+	// Create a mock request
+	req := httptest.NewRequest("GET", "/policy/pdpo/v1/data/missing/path", nil)
+	res := httptest.NewRecorder()
+
+	// Call the function under test
+	getDataInfo(res, req)
+
+	// Check response status code
+	if res.Code == http.StatusNotFound {
+		// Validate response body
+		errorMessage := strings.TrimSpace(res.Body.String())
+		assert.Contains(t, errorMessage, "storage_not_found_error")
+	}
+}
+
+// Mock opasdk.GetDataInfo
+var mockGetData func(ctx context.Context, dataPath string) (*oapicodegen.OPADataResponse_Data, error)
+
+func TestGetData(t *testing.T) {
+
+	// Backup original function
+	originalOpaSDKGetDataInfo := NewOpaSDK
+	NewOpaSDK = func(ctx context.Context, dataPath string) (data *oapicodegen.OPADataResponse_Data, err error) {
+		return mockGetData(ctx, dataPath)
+	}
+	defer func() { NewOpaSDK = originalOpaSDKGetDataInfo }() // Restore after test
+
+	tests := []struct {
+		name           string
+		requestURL     string
+		mockResponse   interface{}
+		mockError      error
+		expectedStatus int
+		expectedBody   string
+	}{
+		{
+			name:           "Success - Data Retrieved",
+			requestURL:     "/policy/pdpo/v1/data/example/path",
+			mockResponse:   map[string]string{"key": "value"},
+			mockError:      nil,
+			expectedStatus: http.StatusOK,
+			expectedBody:   `{"data":{"key":"value"}}`,
+		},
+		{
+			name:           "Error - Storage Not Found",
+			requestURL:     "/policy/pdpo/v1/data/missing/path",
+			mockResponse:   nil,
+			mockError:      errors.New("storage_not_found_error"),
+			expectedStatus: http.StatusNotFound,
+			expectedBody:   "Error in getting data - storage_not_found_error",
+		},
+		{
+			name:           "Error - Internal Server Error",
+			requestURL:     "/policy/pdpo/v1/data/error/path",
+			mockResponse:   nil,
+			mockError:      errors.New("internal server failure"),
+			expectedStatus: http.StatusInternalServerError,
+			expectedBody:   "Error in getting data - internal server failure",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Mock `opasdk.GetDataInfo` behavior
+			mockGetData = func(ctx context.Context, dataPath string) (*oapicodegen.OPADataResponse_Data, error) {
+				var resData oapicodegen.OPADataResponse_Data
+				jsonData, err := json.Marshal(tt.mockResponse)
+				if err != nil {
+					fmt.Printf("Error in converting result into json data %s", err)
+					return nil, err
+				}
+				err = json.Unmarshal(jsonData, &resData)
+				if err != nil {
+					fmt.Printf("Error in unmarshalling data: %s", err)
+					return nil, err
+				}
+				return &resData, tt.mockError
+			}
+
+			res := httptest.NewRecorder()
+
+			// Call the handler
+			getData(res, tt.requestURL)
+
+			// Assert HTTP status
+			assert.Equal(t, tt.expectedStatus, res.Code)
+
+			// Validate response body
+			body := strings.TrimSpace(res.Body.String())
+
+			if tt.expectedStatus == http.StatusOK {
+				var actual map[string]interface{}
+				json.Unmarshal(res.Body.Bytes(), &actual)
+
+				var expected map[string]interface{}
+				json.Unmarshal([]byte(tt.expectedBody), &expected)
+
+				assert.Equal(t, expected, actual)
+			} else {
+				assert.Contains(t, body, tt.expectedBody)
+			}
+		})
+	}
+}
diff --git a/pkg/decision/decision-provider.go b/pkg/decision/decision-provider.go
index ffee901..12896c3 100644
--- a/pkg/decision/decision-provider.go
+++ b/pkg/decision/decision-provider.go
@@ -247,11 +247,20 @@ func sendDecisionErrorResponse(msg string, res http.ResponseWriter, httpStatus i
 	writeErrorJSONResponse(res, httpStatus, msg, *decisionExc)
 }
 
+
+type OPASingletonInstanceFunc func() (*sdk.OPA, error)
+var OPASingletonInstance OPASingletonInstanceFunc = opasdk.GetOPASingletonInstance
+
 //This function returns the opasdk instance
 func getOpaInstance() (*sdk.OPA, error) {
-	return opasdk.GetOPASingletonInstance()
+	return OPASingletonInstance()
 }
 
+
+
+type OPADecisionFunc func(opa *sdk.OPA, ctx context.Context, options sdk.DecisionOptions) (*sdk.DecisionResult, error)
+var OPADecision OPADecisionFunc = (*sdk.OPA).Decision
+
 //This function processes the OPA decision
 func processOpaDecision(res http.ResponseWriter, opa *sdk.OPA, decisionReq *oapicodegen.OPADecisionRequest) {
 	ctx := context.Background()
@@ -263,7 +272,7 @@ func processOpaDecision(res http.ResponseWriter, opa *sdk.OPA, decisionReq *oapi
 	    decisionRes = createSuccessDecisionResponseWithStatus(decisionReq.PolicyName, nil, statusMessage)
 	} else {
 		options := sdk.DecisionOptions{Path: decisionReq.PolicyName, Input: decisionReq.Input}
-		decisionResult, decisionErr := opa.Decision(ctx, options)
+		decisionResult, decisionErr := OPADecision(opa, ctx, options)
 		jsonOutput, err := json.MarshalIndent(decisionResult, "", "  ")
 		if err != nil {
 			log.Warnf("Error serializing decision output: %v\n", err)
diff --git a/pkg/decision/decision-provider_test.go b/pkg/decision/decision-provider_test.go
index 8ee5b04..ad95522 100644
--- a/pkg/decision/decision-provider_test.go
+++ b/pkg/decision/decision-provider_test.go
@@ -20,7 +20,6 @@
 package decision
 
 import (
-	"bou.ke/monkey"
 	"bytes"
 	"context"
 	"encoding/json"
@@ -33,10 +32,8 @@ import (
 	"policy-opa-pdp/consts"
 	"policy-opa-pdp/pkg/model"
 	"policy-opa-pdp/pkg/model/oapicodegen"
-	opasdk "policy-opa-pdp/pkg/opasdk"
 	"policy-opa-pdp/pkg/pdpstate"
 	"policy-opa-pdp/pkg/policymap"
-	"reflect"
 	"testing"
 	"github.com/stretchr/testify/assert"
 )
@@ -324,7 +321,6 @@ func TestWriteOpaJSONResponse_EncodingError(t *testing.T) {
 }
 
 // Mocks for test cases
-var GetOPASingletonInstance = opasdk.GetOPASingletonInstance
 
 var mockDecisionResult = &sdk.DecisionResult{
 	Result: map[string]interface{}{
@@ -361,16 +357,14 @@ func Test_Invalid_request_UUID(t *testing.T) {
 
 	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "s3", "policy-version": "1.0"}]}`
 
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
 
-	originalGetState := pdpstate.GetCurrentState
-	pdpstate.GetCurrentState = func() model.PdpState {
-		return model.Active
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return &sdk.OPA{}, nil // Mocked OPA instance
 	}
-	defer func() { pdpstate.GetCurrentState = originalGetState }()
+	defer func() { OPASingletonInstance = originalFunc }()
+
 	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"s3","policyFilter":["allow"],"input":{"content" : "content"}}`
 	var decisionReq oapicodegen.OPADecisionRequest
 	json.Unmarshal([]byte(jsonString), &decisionReq)
@@ -412,22 +406,22 @@ func Test_valid_HTTP_method(t *testing.T) {
 	defer func() { pdpstate.GetCurrentState = originalGetState }()
 	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"s3","policyFilter":["allow"],"input":{"content" : "content"}}`
 
-	var patch *monkey.PatchGuard
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			return mockDecisionResult, nil
-		},
-	)
-	defer patch.Unpatch()
+	originalOPADecision := OPADecision
+	OPADecision = func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
+	    return mockDecisionResult, nil
+	}
+	defer func() { OPADecision = originalOPADecision }()
+
 
 	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "s3", "policy-version": "1.0"}]}`
 
 
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return &sdk.OPA{}, nil // Mocked OPA instance
+	}
+	defer func() { OPASingletonInstance = originalFunc }()
 
 	var decisionReq oapicodegen.OPADecisionRequest
 	json.Unmarshal([]byte(jsonString), &decisionReq)
@@ -448,27 +442,24 @@ func Test_Error_Marshalling(t *testing.T) {
 	}
 	defer func() { pdpstate.GetCurrentState = originalGetState }()
 	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"s3","policyFilter":["allow"],"input":{"content" : "content"}}`
-	var patch *monkey.PatchGuard
-
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			// Create a mock result with an incompatible field (e.g., a channel)
-			mockDecisionResult := &sdk.DecisionResult{
-				Result: map[string]interface{}{
-					"key": make(chan int),
-				},
-			}
-			return mockDecisionResult, nil
-		},
-	)
-	defer patch.Unpatch()
+	originalOPADecision := OPADecision
+	OPADecision = func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
+		mockDecisionResult := &sdk.DecisionResult{
+			Result: map[string]interface{}{
+				"key": make(chan int),
+			},
+		}
+		return mockDecisionResult, nil
+	}
+	defer func() { OPADecision = originalOPADecision }()
 	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "s3", "policy-version": "1.0"}]}`
 
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return &sdk.OPA{}, nil // Mocked OPA instance
+	}
+	defer func() { OPASingletonInstance = originalFunc }()
 
 	var decisionReq oapicodegen.OPADecisionRequest
 	json.Unmarshal([]byte(jsonString), &decisionReq)
@@ -489,37 +480,39 @@ func mockGetOpaInstance() (*sdk.OPA, error) {
 }
 // Test for Invalid Decision error in Decision Result
 func Test_Invalid_Decision(t *testing.T) {
-	// Mock PDP state
+
 	originalGetState := pdpstate.GetCurrentState
 	pdpstate.GetCurrentState = func() model.PdpState {
 		return model.Active
 	}
 	defer func() { pdpstate.GetCurrentState = originalGetState }()
-
 	// Define a request body that matches expected input format
 	jsonString := `{
 		"policyName": "s3",
 		"policyFilter": ["allow"],
 		"input": {"content": "content"}
 	}`
-
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return &sdk.OPA{}, nil // Mocked OPA instance
+	}
+	defer func() { OPASingletonInstance = originalFunc }()
+	
 	// Patch the OPA Decision method to return an error
-	patch := monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			// Return an explicit error
-			return nil, fmt.Errorf("opa_undefined_error")
-		},
-	)
-	defer patch.Unpatch()
-
+	originalOPADecision := OPADecision
+	OPADecision = func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
+	    return nil, fmt.Errorf("opa_undefined_error")
+	}
+	defer func() { OPADecision = originalOPADecision }()
+	
 	// Create a test HTTP request
 	req := httptest.NewRequest(http.MethodPost, "/opa/decision", bytes.NewBuffer([]byte(jsonString)))
 	req.Header.Set("Content-Type", "application/json")
 	res := httptest.NewRecorder()
 
 	// Call the handler function that processes OPA decision
-	//OpaDecision(res, req)
+	OpaDecision(res, req)
 	// Assert that the response status code is 200
 	assert.Equal(t, 200, res.Code)
 }
@@ -540,28 +533,27 @@ func Test_Valid_Decision_String(t *testing.T) {
 	}`
 
 	// Patch the OPA Decision method to return an error
-	patch := monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-				// Return an explicit error
-				mockDecisionResult := &sdk.DecisionResult{
-				Result: map[string]interface{}{
-					"allowed": "true",
-				},
-			}
-			return mockDecisionResult, nil
-		},
-	)
-
-	defer patch.Unpatch()
-
+	originalOPADecision := OPADecision
+	OPADecision = func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
+		// Return an explicit error
+			mockDecisionResult := &sdk.DecisionResult{
+			Result: map[string]interface{}{
+				"allowed": "true",
+			},
+		}
+		return mockDecisionResult, nil
+	}
+	defer func() { OPADecision = originalOPADecision }()
+	
 	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "s3", "policy-version": "1.0"}]}`
 
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
-
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return &sdk.OPA{}, nil // Mocked OPA instance
+	}
+	defer func() { OPASingletonInstance = originalFunc }()
+	
 	// Create a test HTTP request
 	req := httptest.NewRequest(http.MethodPost, "/opa/decision", bytes.NewBuffer([]byte(jsonString)))
 	req.Header.Set("Content-Type", "application/json")
@@ -574,52 +566,6 @@ func Test_Valid_Decision_String(t *testing.T) {
 	assert.Equal(t, 200, res.Code)
 }
 
-// Test for Policy filter with invalid/not applicable Decision result
-func Test_Policy_Filter_with_invalid_decision_result(t *testing.T) {
-	originalGetState := pdpstate.GetCurrentState
-	pdpstate.GetCurrentState = func() model.PdpState {
-		return model.Active
-	}
-	defer func() { pdpstate.GetCurrentState = originalGetState }()
-	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"mockPolicy","policyFilter":["allow"],"input":{"content" : "content"}}`
-
-	var patch *monkey.PatchGuard
-
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			return mockDecisionResult, nil
-		},
-	)
-	defer patch.Unpatch()
-	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "mockPolicy", "policy-version": "1.0"}]}`
-
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
-
-	body := map[string]interface{}{"PolicyName": jsonString}
-	jsonBody, _ := json.Marshal(body)
-	req := httptest.NewRequest(http.MethodPost, "/opa/decision", bytes.NewBuffer(jsonBody))
-	res := httptest.NewRecorder()
-
-	var patch1 *monkey.PatchGuard
-	patch1 = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&json.Decoder{}), "Decode",
-		func(_ *json.Decoder, v interface{}) error {
-			if req, ok := v.(*oapicodegen.OPADecisionRequest); ok {
-				*req = mockDecisionReq
-			}
-			return nil
-		},
-	)
-	defer patch1.Unpatch()
-	OpaDecision(res, req)
-
-	assert.Equal(t, http.StatusOK, res.Code)
-}
-
 // Test with OPA Decision of boolean type true
 func Test_with_boolean_OPA_Decision(t *testing.T) {
 	originalGetState := pdpstate.GetCurrentState
@@ -629,21 +575,20 @@ func Test_with_boolean_OPA_Decision(t *testing.T) {
 	defer func() { pdpstate.GetCurrentState = originalGetState }()
 	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"s3","policyFilter":["allow"],"input":{"content" : "content"}}`
 
-	var patch *monkey.PatchGuard
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			return mockDecisionResultBool, nil
-		},
-	)
-	defer patch.Unpatch()
-
+	originalOPADecision := OPADecision
+	OPADecision = func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
+	    return mockDecisionResultBool, nil
+	}
+	defer func() { OPADecision = originalOPADecision }()
+	
 	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "s3", "policy-version": "1.0"}]}`
 
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return &sdk.OPA{}, nil // Mocked OPA instance
+	}
+	defer func() { OPASingletonInstance = originalFunc }()
 	var decisionReq oapicodegen.OPADecisionRequest
         json.Unmarshal([]byte(jsonString), &decisionReq)
         body := map[string]interface{}{"PolicyName": decisionReq.PolicyName, "PolicyFilter": decisionReq.PolicyFilter,}
@@ -665,28 +610,25 @@ func Test_decision_Result_String(t *testing.T) {
 	defer func() { pdpstate.GetCurrentState = originalGetState }()
 	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"s3","policyFilter":["allowed"],"input":{"content" : "content"}}`
 
-	var patch *monkey.PatchGuard
-
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			// Create a mock result with an incompatible field (e.g., a channel)
-			mockDecisionResult := &sdk.DecisionResult{
-				Result: map[string]interface{}{
-					"allowed": "true",
-				},
-			}
-			return mockDecisionResult, nil
-		},
-	)
-	defer patch.Unpatch()
+	originalOPADecision := OPADecision
+	OPADecision = func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
+		mockDecisionResult := &sdk.DecisionResult{
+			Result: map[string]interface{}{
+				"allowed": "true",
+			},
+		}
+		return mockDecisionResult, nil
+	}
+	defer func() { OPADecision = originalOPADecision }()
 	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "s3", "policy-version": "1.0"}]}`
 
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
-
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return &sdk.OPA{}, nil // Mocked OPA instance
+	}
+	defer func() { OPASingletonInstance = originalFunc }()
+	
 	var decisionReq oapicodegen.OPADecisionRequest
 	json.Unmarshal([]byte(jsonString), &decisionReq)
 	body := map[string]interface{}{"PolicyName": decisionReq.PolicyName, "PolicyFilter": decisionReq.PolicyFilter,}
@@ -699,169 +641,68 @@ func Test_decision_Result_String(t *testing.T) {
 	assert.Equal(t, http.StatusOK, res.Code)
 }
 
-// Test with OPA Decision with String type wth filtered result
-func Test_decision_Result_String_with_filtered_Result(t *testing.T) {
-	originalGetState := pdpstate.GetCurrentState
-	pdpstate.GetCurrentState = func() model.PdpState {
-		return model.Active
-	}
-	defer func() { pdpstate.GetCurrentState = originalGetState }()
-	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"mockPolicy","policyFilter":["allow"],"input":{"content" : "content"}}`
-
-	var patch *monkey.PatchGuard
-
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			// Simulate an error to trigger the second error block
-			return mockDecisionResult, nil
-		},
-	)
-	defer patch.Unpatch()
-	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "mockPolicy", "policy-version": "1.0"}]}`
-
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
-	body := map[string]interface{}{"PolicyName": jsonString}
-	jsonBody, _ := json.Marshal(body)
-	req := httptest.NewRequest(http.MethodPost, "/opa/decision", bytes.NewBuffer(jsonBody))
-	res := httptest.NewRecorder()
-	var patch1 *monkey.PatchGuard
-	patch1 = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&json.Decoder{}), "Decode",
-		func(_ *json.Decoder, v interface{}) error {
-			if req, ok := v.(*oapicodegen.OPADecisionRequest); ok {
-				*req = mockDecisionReq2
-			}
-			return nil
-		},
-	)
-	defer patch1.Unpatch()
-	OpaDecision(res, req)
 
-	assert.Equal(t, http.StatusOK, res.Code)
 
+var mockPoliciesMap string
+
+func mockLastDeployedPolicies() {
+	policymap.LastDeployedPolicies = mockPoliciesMap
 }
 
-// Test with OPA Decision with String type wth filtered result
-func Test_decision_with_slash_Result_String_with_filtered_Result(t *testing.T) {
-	originalGetState := pdpstate.GetCurrentState
-	pdpstate.GetCurrentState = func() model.PdpState {
-		return model.Active
-	}
-	defer func() { pdpstate.GetCurrentState = originalGetState }()
-	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"opa/mockPolicy","policyFilter":["allow"],"input":{"content" : "content"}}`
-
-	var patch *monkey.PatchGuard
-
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			// Simulate an error to trigger the second error block
-			return mockDecisionResult, nil
-		},
-	)
-	defer patch.Unpatch()
-	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "opa.mockPolicy", "policy-version": "1.0"}]}`
-
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
-	body := map[string]interface{}{"PolicyName": jsonString}
-	jsonBody, _ := json.Marshal(body)
-	req := httptest.NewRequest(http.MethodPost, "/opa/decision", bytes.NewBuffer(jsonBody))
+// Test case: No policies deployed
+func TestHandlePolicyValidation_NoPoliciesDeployed(t *testing.T) {
+	mockPoliciesMap = ""
+	mockLastDeployedPolicies()
+
+	req := &oapicodegen.OPADecisionRequest{}
 	res := httptest.NewRecorder()
-	var patch1 *monkey.PatchGuard
-	patch1 = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&json.Decoder{}), "Decode",
-		func(_ *json.Decoder, v interface{}) error {
-			if req, ok := v.(*oapicodegen.OPADecisionRequest); ok {
-				*req = mockDecisionReq3
-			}
-			return nil
-		},
-	)
-	defer patch1.Unpatch()
-	OpaDecision(res, req)
+	var errorDtls string
+	var httpStatus int
+	var policyId string
 
-	assert.Equal(t, http.StatusOK, res.Code)
+	handlePolicyValidation(res, req, &errorDtls, &httpStatus, &policyId)
 
+	assert.Equal(t, "No policies are deployed.", errorDtls)
+	assert.Equal(t, http.StatusBadRequest, httpStatus)
 }
 
-// Test with OPA Decision with unexpected type wth filtered result
-func Test_decision_with_filtered_Result_as_unexpected_Res_Type(t *testing.T) {
-	originalGetState := pdpstate.GetCurrentState
-	pdpstate.GetCurrentState = func() model.PdpState {
-		return model.Active
-	}
-	defer func() { pdpstate.GetCurrentState = originalGetState }()
-	jsonString := `{"onapName":"CDS","onapComponent":"CDS","onapInstance":"CDS", "currentDate": "2024-11-22", "currentTime": "2024-11-22T11:34:56Z", "timeZone": "UTC", "timeOffset": "+05:30", "currentDateTime": "2024-11-22T12:08:00Z","policyName":"mockPolicy","policyFilter":["allow"],"input":{"content" : "content"}}`
-
-	var patch *monkey.PatchGuard
-
-	patch = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&sdk.OPA{}), "Decision",
-		func(_ *sdk.OPA, _ context.Context, _ sdk.DecisionOptions) (*sdk.DecisionResult, error) {
-			// Simulate an error to trigger the second error block
-			return mockDecisionResultUnexp, nil
-		},
-	)
-	defer patch.Unpatch()
-	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"policy-id": "mockPolicy", "policy-version": "1.0"}]}`
-
-	monkey.Patch(getOpaInstance, func() (*sdk.OPA, error) {
-        return &sdk.OPA{}, nil // Mocked OPA instance
-    })
-    defer monkey.Unpatch(getOpaInstance)
-	body := map[string]interface{}{"PolicyName": jsonString}
-	jsonBody, _ := json.Marshal(body)
-	req := httptest.NewRequest(http.MethodPost, "/opa/decision", bytes.NewBuffer(jsonBody))
+// Test case: Policy name does not exist
+func TestHandlePolicyValidation_PolicyDoesNotExist(t *testing.T) {
+	mockPoliciesMap = `{"deployed_policies_dict":[{"policy-id":"test-policy","policy-version":"1.0"}]}`
+	mockLastDeployedPolicies()
+
+	req := &oapicodegen.OPADecisionRequest{PolicyName: "non-existent-policy"}
 	res := httptest.NewRecorder()
-	var patch1 *monkey.PatchGuard
-	patch1 = monkey.PatchInstanceMethod(
-		reflect.TypeOf(&json.Decoder{}), "Decode",
-		func(_ *json.Decoder, v interface{}) error {
-			if req, ok := v.(*oapicodegen.OPADecisionRequest); ok {
-				*req = mockDecisionReq2
-			}
-			return nil
-		},
-	)
-	defer patch1.Unpatch()
-	OpaDecision(res, req)
+	var errorDtls string
+	var httpStatus int
+	var policyId string
 
-	assert.Equal(t, http.StatusOK, res.Code)
-}
+	handlePolicyValidation(res, req, &errorDtls, &httpStatus, &policyId)
 
-// Test with OPA Decision with Error in response
-func TestWriteErrorJSONResponse_EncodingFailure(t *testing.T) {
-	recorder := httptest.NewRecorder()
-	errorMessage := "Test error message"
-	policyName := "TestPolicy"
-	responseCode := oapicodegen.ErrorResponseResponseCode("500")
-	mockDecisionExc := oapicodegen.ErrorResponse{
-		ErrorMessage: &errorMessage,
-		PolicyName:   &policyName,
-		ResponseCode: &responseCode,
-	}
+	assert.Equal(t, "Policy Name non-existent-policy does not exist", errorDtls)
+	assert.Equal(t, http.StatusBadRequest, httpStatus)
+}
 
-	patch := monkey.PatchInstanceMethod(
-		reflect.TypeOf(json.NewEncoder(recorder)),
-		"Encode",
-		func(_ *json.Encoder, _ interface{}) error {
-			return errors.New("forced encoding error")
-		},
-	)
-	defer patch.Unpatch()
+// Test case: OPA instance failure
+func TestHandlePolicyValidation_OPAInstanceFailure(t *testing.T) {
+	mockPoliciesMap = `{"deployed_policies_dict":[{"policy-id":"test-policy","policy-version":"1.0"}]}`
+	mockLastDeployedPolicies()
 
-	writeErrorJSONResponse(recorder, http.StatusInternalServerError, "Encoding error", mockDecisionExc)
+	req := &oapicodegen.OPADecisionRequest{PolicyName: "test-policy"}
+	res := httptest.NewRecorder()
+	var errorDtls string
+	var httpStatus int
+	var policyId string
+
+	originalFunc := OPASingletonInstance
+	// Mock the function
+	OPASingletonInstance = func() (*sdk.OPA, error) {
+		return nil, errors.New("failed to get OPA instance")
+	}
+	defer func() { OPASingletonInstance = originalFunc }()
 
-	response := recorder.Result()
-	defer response.Body.Close()
+	handlePolicyValidation(res, req, &errorDtls, &httpStatus, &policyId)
 
-	assert.Equal(t, http.StatusInternalServerError, response.StatusCode)
+	assert.Equal(t, http.StatusInternalServerError, httpStatus)
 }
 
diff --git a/pkg/healthcheck/healthcheck.go b/pkg/healthcheck/healthcheck.go
index 9a2a1a4..e7c6769 100644
--- a/pkg/healthcheck/healthcheck.go
+++ b/pkg/healthcheck/healthcheck.go
@@ -1,6 +1,6 @@
 // -
 //   ========================LICENSE_START=================================
-//   Copyright (C) 2024: Deutsche Telekom
+//   Copyright (C) 2024-2025: Deutsche Telekom
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -71,5 +71,7 @@ func HealthCheckHandler(w http.ResponseWriter, r *http.Request) {
 	log.Debug("Received Health Check message")
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
-	json.NewEncoder(w).Encode(response)
+	if err := json.NewEncoder(w).Encode(response); err != nil {
+		log.Warnf("Failed to decode json response: %v", err)
+	}
 }
diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go
index c8c4d15..57fa7ce 100644
--- a/pkg/healthcheck/healthcheck_test.go
+++ b/pkg/healthcheck/healthcheck_test.go
@@ -1,6 +1,6 @@
 // -
 //   ========================LICENSE_START=================================
-//   Copyright (C) 2024: Deutsche Telekom
+//   Copyright (C) 2024-2025: Deutsche Telekom
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@ package healthcheck
 
 import (
 	"encoding/json"
+	"errors"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"net/http"
 	"net/http/httptest"
 	"policy-opa-pdp/pkg/model/oapicodegen"
@@ -93,6 +95,34 @@ func TestHealthCheckHandler_Failure(t *testing.T) {
 
 }
 
+// MockResponseWriter to simulate Encode failure
+type FailingResponseWriter struct {
+	mock.Mock
+}
+
+func (f *FailingResponseWriter) Header() http.Header {
+	return http.Header{}
+}
+
+func (f *FailingResponseWriter) Write(b []byte) (int, error) {
+	// Simulate a failure during writing JSON encoding
+	return 0, errors.New("forced JSON encoding error")
+}
+
+func (f *FailingResponseWriter) WriteHeader(statusCode int) {}
+
+func TestHealthCheckHandler_JSONEncodeFailure(t *testing.T) {
+	req, err := http.NewRequest("GET", "/healthcheck", nil)
+	assert.NoError(t, err)
+
+	mockWriter := new(FailingResponseWriter)
+
+	HealthCheckHandler(mockWriter, req) // Call handler with failing writer
+
+	// Verify if an encoding failure was triggered
+	mockWriter.AssertNotCalled(t, "Write") // Should not have written any successful response
+}
+
 func TestHealthCheckHandler_ValidUUID(t *testing.T) {
 	// Prepare a request with a valid UUID in the header
 	req := httptest.NewRequest(http.MethodGet, "/healthcheck", nil)
diff --git a/pkg/kafkacomm/handler/pdp_state_change_handler.go b/pkg/kafkacomm/handler/pdp_state_change_handler.go
index a2249d5..bd88147 100644
--- a/pkg/kafkacomm/handler/pdp_state_change_handler.go
+++ b/pkg/kafkacomm/handler/pdp_state_change_handler.go
@@ -42,7 +42,11 @@ func pdpStateChangeMessageHandler(message []byte, p publisher.PdpStatusSender) e
 	log.Debugf("PDP STATE CHANGE message received: %s", string(message))
 
 	if pdpStateChange.State != "" {
-		pdpstate.SetState(pdpStateChange.State)
+		err := pdpstate.SetState(pdpStateChange.State)
+		if err != nil {
+			log.Errorf("Failed to set PDP state: %v", err)
+			return err // or handle the error as appropriate
+		}
 
 	}
 
diff --git a/pkg/kafkacomm/handler/pdp_update_deploy_policy.go b/pkg/kafkacomm/handler/pdp_update_deploy_policy.go
index 5c7651c..bf56951 100644
--- a/pkg/kafkacomm/handler/pdp_update_deploy_policy.go
+++ b/pkg/kafkacomm/handler/pdp_update_deploy_policy.go
@@ -39,29 +39,57 @@ import (
 	"strings"
 )
 
+// Define types for the functions
+type (
+	UpsertPolicyFunc             func(model.ToscaPolicy) error
+	UpsertDataFunc               func(model.ToscaPolicy) error
+	HandlePolicyDeploymentFunc   func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string)
+	validatePackageNameFunc      func(key, decodedPolicyContent string) error
+	extractAndDecodePoliciesFunc func(policy model.ToscaPolicy) (map[string]string, []string, error)
+	createPolicyDirectoriesFunc  func(decodedPolicies map[string]string) error
+	extractAndDecodeDatFunc      func(policy model.ToscaPolicy) (map[string]string, []string, error)
+	createDataDirectoriesFunc    func(decodedData map[string]string) error
+	createAndStorePolicyDataFunc func(policy model.ToscaPolicy) error
+	validateParentPolicyFunc     func(policy model.ToscaPolicy) (bool, error)
+)
+
+// Declare function variables that will be used during testing
+var (
+	upsertPolicyFunc            UpsertPolicyFunc             = upsertPolicy
+	upsertDataFunc              UpsertDataFunc               = upsertData
+	handlePolicyDeploymentVar   HandlePolicyDeploymentFunc   = handlePolicyDeployment
+	validatePackageNameVar      validatePackageNameFunc      = validatePackageName
+	extractAndDecodePoliciesVar extractAndDecodePoliciesFunc = extractAndDecodePolicies
+	createPolicyDirectoriesVar  createPolicyDirectoriesFunc  = createPolicyDirectories
+	extractAndDecodeDataVar     extractAndDecodeDatFunc      = extractAndDecodeData
+	createDataDirectoriesVar    createDataDirectoriesFunc    = createDataDirectories
+	createAndStorePolicyDataVar createAndStorePolicyDataFunc = createAndStorePolicyData
+	validateParentPolicyVar     validateParentPolicyFunc     = validateParentPolicy
+)
+
 // stores policy and data files to directory.
 func createAndStorePolicyData(policy model.ToscaPolicy) error {
 
 	// Extract and decode policies
-	decodedPolicies, key, err := extractAndDecodePolicies(policy)
+	decodedPolicies, key, err := extractAndDecodePoliciesVar(policy)
 	if err != nil {
 		log.Errorf("Failed to extract and decode policies for key : %v, %v", key, err)
 		return err
 	}
 
-	err = createPolicyDirectories(decodedPolicies)
+	err = createPolicyDirectoriesVar(decodedPolicies)
 	if err != nil {
 		log.Errorf("Failed to create policy directories: %v", err)
 		return err
 	}
 
-	decodedData, key, err := extractAndDecodeData(policy)
+	decodedData, key, err := extractAndDecodeDataVar(policy)
 	if err != nil {
 		log.Errorf("Failed to extract and decode data: %v", err)
 		return err
 	}
 
-	err = createDataDirectories(decodedData)
+	err = createDataDirectoriesVar(decodedData)
 	if err != nil {
 		log.Errorf("Failed to create data directories: %v", err)
 		return err
@@ -76,13 +104,13 @@ func createPolicyDirectories(decodedPolicies map[string]string) error {
 	for key, decodedPolicy := range decodedPolicies {
 		policyDir := filepath.Join(basePolicyDir, filepath.Join(strings.Split(key, ".")...))
 
-		err := utils.CreateDirectory(policyDir)
+		err := utils.CreateDirectoryVar(policyDir)
 		if err != nil {
 			log.Errorf("Failed to create policy directory %s: %v", policyDir, err)
 			return err
 		}
 
-		err = os.WriteFile(filepath.Join(policyDir, "policy.rego"), []byte(decodedPolicy), os.ModePerm)
+		err = os.WriteFile(filepath.Join(policyDir, "policy.rego"), []byte(decodedPolicy), 0600)
 		if err != nil {
 			log.Errorf("Failed to save policy.rego for %s: %v", key, err)
 			return err
@@ -99,13 +127,13 @@ func createDataDirectories(decodedData map[string]string) error {
 	for key, dataContent := range decodedData {
 		dataDir := filepath.Join(baseDataDir, filepath.Join(strings.Split(key, ".")...))
 
-		err := utils.CreateDirectory(dataDir)
+		err := utils.CreateDirectoryVar(dataDir)
 		if err != nil {
 			log.Errorf("Failed to create data directory %s: %v", dataDir, err)
 			return err
 		}
 
-		err = os.WriteFile(filepath.Join(dataDir, "data.json"), []byte(dataContent), os.ModePerm)
+		err = os.WriteFile(filepath.Join(dataDir, "data.json"), []byte(dataContent), 0600)
 		if err != nil {
 			log.Errorf("Failed to save data.json for %s: %v", key, err)
 			return err
@@ -134,7 +162,7 @@ func extractAndDecodePolicies(policy model.ToscaPolicy) (map[string]string, []st
 		log.Tracef("Decoded policy content: %s", decodedPolicy)
 
 		// Validate package name
-		if err := validatePackageName(key, string(decodedPolicy)); err != nil {
+		if err := validatePackageNameVar(key, string(decodedPolicy)); err != nil {
 
 			log.Errorf("Validation for Policy: %v failed, %v", key, err)
 			return nil, nil, err
@@ -214,10 +242,10 @@ func getDirName(policy model.ToscaPolicy) []string {
 
 // upsert policy to sdk.
 func upsertPolicy(policy model.ToscaPolicy) error {
-	decodedContent, keys, _ := extractAndDecodePolicies(policy)
+	decodedContent, keys, _ := extractAndDecodePoliciesVar(policy)
 	for _, key := range keys {
 		policyContent := decodedContent[key]
-		err := opasdk.UpsertPolicy(context.Background(), key, []byte(policyContent))
+		err := opasdk.UpsertPolicyVar(context.Background(), key, []byte(policyContent))
 		if err != nil {
 			log.Errorf("Failed to Insert Policy %v", err)
 			return err
@@ -229,7 +257,7 @@ func upsertPolicy(policy model.ToscaPolicy) error {
 
 // handles writing data to sdk.
 func upsertData(policy model.ToscaPolicy) error {
-	decodedDataContent, dataKeys, _ := extractAndDecodeData(policy)
+	decodedDataContent, dataKeys, _ := extractAndDecodeDataVar(policy)
 	for _, dataKey := range dataKeys {
 		dataContent := decodedDataContent[dataKey]
 		reader := bytes.NewReader([]byte(dataContent))
@@ -244,7 +272,7 @@ func upsertData(policy model.ToscaPolicy) error {
 
 		}
 		keypath := "/" + strings.Replace(dataKey, ".", "/", -1)
-		err = opasdk.WriteData(context.Background(), keypath, wdata)
+		err = opasdk.WriteDataVar(context.Background(), keypath, wdata)
 		if err != nil {
 			log.Errorf("Failed to Write Data: %s: %v", policy.Name, err)
 			return err
@@ -266,7 +294,7 @@ func handlePolicyDeployment(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSend
 	for _, policy := range pdpUpdate.PoliciesToBeDeployed {
 		// Validate the policy
 
-		policyAllowed, err := validateParentPolicy(policy)
+		policyAllowed, err := validateParentPolicyVar(policy)
 		if err != nil {
 			log.Warnf("Tosca Policy Id validation failed for policy nameas it is a parent folder:%s, %v", policy.Name, err)
 			failureMessages = append(failureMessages, fmt.Sprintf("%s, %v", policy.Name, err))
@@ -287,7 +315,7 @@ func handlePolicyDeployment(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSend
 		}
 
 		// Create and store policy data
-		if err := createAndStorePolicyData(policy); err != nil {
+		if err := createAndStorePolicyDataVar(policy); err != nil {
 			failureMessages = append(failureMessages, fmt.Sprintf("%s: %v", policy.Name, err))
 			metrics.IncrementDeployFailureCount()
 			metrics.IncrementTotalErrorCount()
@@ -343,7 +371,7 @@ func verifyPolicyByBundleCreation(policy model.ToscaPolicy) error {
 		return fmt.Errorf("failed to extract folder name")
 	}
 	// create bundle
-	output, err := createBundleFunc(exec.Command, policy)
+	output, err := createBundleFuncVar(exec.Command, policy)
 	if err != nil {
 		log.Warnf("Failed to initialize bundle for %s: %s", policy.Name, string(output))
 		for _, dirPath := range dirNames {
@@ -359,12 +387,12 @@ func verifyPolicyByBundleCreation(policy model.ToscaPolicy) error {
 
 // handles Upsert func for policy and data
 func upsertPolicyAndData(policy model.ToscaPolicy, successPolicies map[string]string) error {
-	if err := upsertPolicy(policy); err != nil {
+	if err := upsertPolicyFunc(policy); err != nil {
 		log.Warnf("Failed to upsert policy: %v", err)
 		return fmt.Errorf("Failed to Insert Policy: %s: %v", policy.Name, err)
 	}
 
-	if err := upsertData(policy); err != nil {
+	if err := upsertDataFunc(policy); err != nil {
 		return fmt.Errorf("Failed to Write Data: %s: %v", policy.Name, err)
 	}
 
diff --git a/pkg/kafkacomm/handler/pdp_update_deploy_policy_test.go b/pkg/kafkacomm/handler/pdp_update_deploy_policy_test.go
new file mode 100644
index 0000000..3e4a24a
--- /dev/null
+++ b/pkg/kafkacomm/handler/pdp_update_deploy_policy_test.go
@@ -0,0 +1,1164 @@
+// -
+//   ========================LICENSE_START=================================
+//   Copyright (C) 2025 Deutsche Telekom
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//   SPDX-License-Identifier: Apache-2.0
+//   ========================LICENSE_END===================================
+
+package handler
+
+import (
+	"context"
+	"encoding/base64"
+	"errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"policy-opa-pdp/pkg/kafkacomm/publisher/mocks"
+	"policy-opa-pdp/pkg/model"
+	"policy-opa-pdp/pkg/opasdk"
+	"policy-opa-pdp/pkg/policymap"
+	"policy-opa-pdp/pkg/utils"
+	"strings"
+	"testing"
+)
+
+func TestValidatePackageName(t *testing.T) {
+	// Test cases
+	tests := []struct {
+		key                  string
+		decodedPolicyContent string
+		expectedError        bool
+	}{
+		{
+			key:                  "mypackage",
+			decodedPolicyContent: "package mypackage\n// Some comments",
+			expectedError:        false,
+		},
+		{
+			key:                  "mypackage",
+			decodedPolicyContent: "",
+			expectedError:        true, // Expecting an error due to no content
+		},
+		{
+			key:                  "mypackage",
+			decodedPolicyContent: " import fmt\n// No package declaration",
+			expectedError:        true, // Expecting an error due to invalid package declaration
+		},
+		{
+			key:                  "mypackage",
+			decodedPolicyContent: "package anotherpackage\n// Wrong package name",
+			expectedError:        true, // Expecting an error due to package name mismatch
+		},
+	}
+	// Run each test case
+	for _, tt := range tests {
+		t.Run(tt.key, func(t *testing.T) {
+			err := validatePackageName(tt.key, tt.decodedPolicyContent)
+			if tt.expectedError {
+				assert.Error(t, err) // Expecting an error
+			} else {
+				assert.NoError(t, err) // Expecting no error
+			}
+		})
+	}
+}
+
+func TestGetDirName(t *testing.T) {
+	var testData = []struct {
+		name     string
+		policy   model.ToscaPolicy // Use the actual package name
+		expected []string
+	}{
+		{
+			name: "Basic valid case",
+			policy: model.ToscaPolicy{
+				Type:        "onap.policies.native.opa",
+				TypeVersion: "1.0.0",
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"key1": "value1",
+						"key2": "value2",
+					},
+					Policy: map[string]string{
+						"policy1": "value1",
+						"policy2": "value2",
+					},
+				},
+				Name:    "zone",
+				Version: "1.0.0",
+				Metadata: model.Metadata{
+					PolicyID:      "zone",
+					PolicyVersion: "1.0.0",
+				},
+			},
+			expected: []string{
+				"/opt/data/key2",
+				"/opt/data/key1",
+				"/opt/policies/policy1",
+				"/opt/policies/policy2",
+			},
+		},
+		{
+			name: "Empty policy",
+			policy: model.ToscaPolicy{
+				Type:        "onap.policies.native.opa",
+				TypeVersion: "1.0.0",
+				Properties: model.PolicyProperties{
+					Data:   map[string]string{},
+					Policy: map[string]string{},
+				},
+				Name:    "zone",
+				Version: "1.0.0",
+				Metadata: model.Metadata{
+					PolicyID:      "zone",
+					PolicyVersion: "1.0.0",
+				},
+			},
+			expected: []string{}, // No directories expected
+		},
+		{
+			name: "Multiple keys",
+			policy: model.ToscaPolicy{
+				Type:        "onap.policies.native.opa",
+				TypeVersion: "1.0.0",
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"key1": "value1",
+						"key2": "value2",
+					},
+					Policy: map[string]string{
+						"policy1": "value1",
+						"policy2": "value2",
+					},
+				},
+				Name:    "zone",
+				Version: "1.0.0",
+				Metadata: model.Metadata{
+					PolicyID:      "zone",
+					PolicyVersion: "1.0.0",
+				},
+			},
+			expected: []string{
+				"/opt/data/key1",
+				"/opt/data/key2",
+				"/opt/policies/policy1",
+				"/opt/policies/policy2",
+			},
+		},
+		{
+			name: "Special characters",
+			policy: model.ToscaPolicy{
+				Type:        "onap.policies.native.opa",
+				TypeVersion: "1.0.0",
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"key.with.dot": "value1",
+					},
+					Policy: map[string]string{
+						"policy.with.dot": "value2",
+					},
+				},
+				Name:    "zone",
+				Version: "1.0.0",
+				Metadata: model.Metadata{
+					PolicyID:      "zone",
+					PolicyVersion: "1.0.0",
+				},
+			},
+			expected: []string{
+				"/opt/data/key/with/dot",
+				"/opt/policies/policy/with/dot",
+			},
+		},
+	}
+	for _, tt := range testData {
+		t.Run(tt.name, func(t *testing.T) {
+			result := getDirName(tt.policy)
+			// Check that the actual result is either nil or empty
+			if len(tt.expected) == 0 {
+				// They should both be empty
+				assert.Empty(t, result) // Assert that result is empty
+			} else {
+				assert.ElementsMatch(t, tt.expected, result) // Standard equality check for non-empty scenarios
+			}
+		})
+	}
+}
+
+func TestExtractAndDecodeData(t *testing.T) {
+	tests := []struct {
+		name         string
+		policy       model.ToscaPolicy
+		expectedData map[string]string
+		expectedKeys []string
+		expectError  bool
+	}{
+		{
+			name: "Valid base64 data",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"key1": base64.StdEncoding.EncodeToString([]byte("value1")),
+						"key2": base64.StdEncoding.EncodeToString([]byte("value2")),
+					},
+				},
+			},
+			expectedData: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+			},
+			expectedKeys: []string{"key1", "key2"},
+			expectError:  false,
+		},
+		{
+			name: "Empty data map",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{},
+				},
+			},
+			expectedData: map[string]string{},
+			expectedKeys: []string{},
+			expectError:  false,
+		},
+		{
+			name: "Invalid base64 data",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"key1": "invalid_base64_data", // Not valid base64
+					},
+				},
+			},
+			expectedData: nil,
+			expectedKeys: nil,
+			expectError:  true, // We expect an error here
+		},
+		{
+			name: "Multiple base64 entries",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"key1": base64.StdEncoding.EncodeToString([]byte("value1")),
+						"key2": base64.StdEncoding.EncodeToString([]byte("value2")),
+						"key3": base64.StdEncoding.EncodeToString([]byte("value3")),
+					},
+				},
+			},
+			expectedData: map[string]string{
+				"key1": "value1",
+				"key2": "value2",
+				"key3": "value3",
+			},
+			expectedKeys: []string{"key1", "key2", "key3"},
+			expectError:  false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			actualData, actualKeys, err := extractAndDecodeData(tt.policy)
+			if tt.expectError {
+				require.Error(t, err) // Assert that an error occurred
+				return
+			} else {
+				assert.NoError(t, err) // Ensure no error occurred
+			}
+			// Check the output against expected values
+			assert.Equal(t, tt.expectedData, actualData)
+			assert.ElementsMatch(t, tt.expectedKeys, actualKeys) // Use ElementsMatch for unordered comparison
+		})
+	}
+}
+
+// Test cases for extracting and decoding policies from a ToscaPolicy struct
+func TestExtractAndDecodePolicies(t *testing.T) {
+	tests := []struct {
+		name             string
+		policy           model.ToscaPolicy
+		expectedPolicies map[string]string
+		expectedKeys     []string
+		expectError      bool
+	}{
+		{
+			name: "Valid base64 policy",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Policy: map[string]string{
+						"policy1": base64.StdEncoding.EncodeToString([]byte("decoded policy content")),
+					},
+				},
+			},
+			expectedPolicies: map[string]string{
+				"policy1": "decoded policy content",
+			},
+			expectedKeys: []string{"policy1"},
+			expectError:  false,
+		},
+		{
+			name: "Empty policy map",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Policy: map[string]string{},
+				},
+			},
+			expectedPolicies: map[string]string{},
+			expectedKeys:     []string{},
+			expectError:      false,
+		},
+		{
+			name: "Invalid base64 policy",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Policy: map[string]string{
+						"policy1": "invalid_base64_data", // Not valid base64
+					},
+				},
+			},
+			expectedPolicies: nil,
+			expectedKeys:     nil,
+			expectError:      true,
+		},
+		{
+			name: "Invalid package name validation",
+			policy: model.ToscaPolicy{
+				Properties: model.PolicyProperties{
+					Policy: map[string]string{
+						"invalidPolicy": base64.StdEncoding.EncodeToString([]byte("decoded policy content")),
+					},
+				},
+			},
+			expectedPolicies: nil,
+			expectedKeys:     nil,
+			expectError:      true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Mocking the validatePackageName function
+			var err error
+			if tt.expectError && tt.name == "Invalid package name validation" {
+				validatePackageNameVar = func(key, decodedPolicyContent string) error {
+					return errors.New("package name validation failed")
+				}
+			} else {
+				// Valid behavior for succeeding tests
+				validatePackageNameVar = func(key, decodedPolicyContent string) error {
+					return nil // No error for a valid package name
+				}
+			}
+			actualPolicies, actualKeys, err := extractAndDecodePolicies(tt.policy)
+			if tt.expectError {
+				assert.Error(t, err) // We expect an error
+			} else {
+				assert.NoError(t, err) // We expect no error
+				// Check the output against expected values
+				assert.Equal(t, tt.expectedPolicies, actualPolicies)
+				assert.ElementsMatch(t, tt.expectedKeys, actualKeys) // Compare keys
+			}
+		})
+	}
+}
+
+func TestValidateParentPolicy(t *testing.T) {
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["cell.consis"],"policy": ["cell.consis"],"policy-id": "cdll.consis","policy-version": "1.0.0"},{"data": ["parent"],"policy": ["parent"],"policy-id": "parent.policy","policy-version": "1.0.0"}]}` // Reset to valid case
+	tests := []struct {
+		name       string
+		input      model.ToscaPolicy
+		expectPass bool
+		expectErr  bool
+	}{
+		{
+			name:       "Valid parent policy",
+			input:      model.ToscaPolicy{Name: "zone"},
+			expectPass: true,
+			expectErr:  false,
+		},
+		{
+			name:       "Valid child policy",
+			input:      model.ToscaPolicy{Name: "parent.child.policy"},
+			expectPass: true,
+			expectErr:  false,
+		},
+		{
+			name:       "Empty policy name",
+			input:      model.ToscaPolicy{Name: ""},
+			expectPass: false,
+			expectErr:  true,
+		},
+		{
+			name:       "Policy id not present",
+			input:      model.ToscaPolicy{Name: "cell"},
+			expectPass: false,
+			expectErr:  true,
+		},
+		{
+			name:       "Malformed last deployed policies",
+			input:      model.ToscaPolicy{Name: "parent.policy"},
+			expectPass: false,
+			expectErr:  true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// If you want to test malformed policies, adjust policymap.LastDeployedPolicies accordingly
+			if tt.name == "Malformed last deployed policies" {
+				policymap.LastDeployedPolicies = `{"deployed_policies_dict": [}`
+			} else if tt.name == "Policy id not present" {
+				policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["parent"],"policy": ["parent"],"olicy-id": "parent.policy","policy-version": "1.0.0"}]}` // Reset to valid case
+			}
+			actualPass, actualErr := validateParentPolicy(tt.input)
+			if tt.expectErr {
+				assert.Error(t, actualErr)
+			} else {
+				assert.NoError(t, actualErr)
+			}
+			assert.Equal(t, tt.expectPass, actualPass)
+		})
+	}
+}
+
+func TestUpsertPolicyAndData_SuccessfulUpsert(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name: "TestPolicy",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"testPolicy": "encoded_value"},
+			Data:   map[string]string{"testData": "encoded_data"},
+		},
+	}
+	// Set mocks for this test only
+	upsertPolicyFunc = func(model.ToscaPolicy) error { return nil }
+	upsertDataFunc = func(model.ToscaPolicy) error { return nil }
+	err := upsertPolicyAndData(policy, nil)
+	assert.NoError(t, err)
+}
+func TestUpsertPolicyAndData_PolicyUpsertFailure(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name: "TestPolicy",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"testPolicy": "encoded_value"},
+			Data:   map[string]string{"testData": "encoded_data"},
+		},
+	}
+	// Set mock to simulate policy upsert failure
+	upsertPolicyFunc = func(policy model.ToscaPolicy) error {
+		return errors.New("mock policy upsert error")
+	}
+	upsertDataFunc = func(model.ToscaPolicy) error { return nil }
+	err := upsertPolicyAndData(policy, nil)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failed to Insert Policy")
+}
+func TestUpsertPolicyAndData_DataUpsertFailure(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name: "TestPolicy",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"testPolicy": "encoded_value"},
+			Data:   map[string]string{"testData": "encoded_data"},
+		},
+	}
+	// Set mocks for this test
+	upsertPolicyFunc = func(model.ToscaPolicy) error { return nil }
+	upsertDataFunc = func(model.ToscaPolicy) error { return errors.New("mock data upsert error") }
+	err := upsertPolicyAndData(policy, nil)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failed to Write Data")
+}
+
+func TestVerifyPolicyByBundleCreation(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"role": "cGFja2FnZSByb2xlCgppbXBvcnQgcmVnby52MQoKIyBCeSBkZWZhdWx0LCBkZW55IHJlcXVlc3RzLgpkZWZhdWx0IGFsbG93IDo9IGZhbHNlCgojIEFsbG93IGFkbWlucyB0byBkbyBhbnl0aGluZy4KYWxsb3cgaWYgdXNlcl9pc19hZG1pbgoKIyBBbGxvdyB0aGUgYWN0aW9uIGlmIHRoZSB1c2VyIGlzIGdyYW50ZWQgcGVybWlzc2lvbiB0byBwZXJmb3JtIHRoZSBhY3Rpb24uCmFsbG93IGlmIHsKICAgICAgICAjIEZpbmQgZ3JhbnRzIGZvciB0aGUgdXNlci4KICAgICAgICBzb21lIGdyYW50IGluIHVzZXJfaXNfZ3JhbnRlZAoKICAgICAgICAjIENoZWNrIGlmIHRoZSBncmFudCBwZXJtaXRzIHRoZSBhY3Rpb24uCiAgICAgICAgaW5wdXQuYWN0aW9uID09IGdyYW50LmFjdGlvbgogICAgICAgIGlucHV0LnR5cGUgPT0gZ3JhbnQudHlwZQp9CgojIHVzZXJfaXNfYWRtaW4gaXMgdHJ1ZSBpZiAiYWRtaW4iIGlzIGFtb25nIHRoZSB1c2VyJ3Mgcm9sZXMgYXMgcGVyIGRhdGEudXNlcl9yb2xlcwp1c2VyX2lzX2FkbWluIGlmICJhZG1pbiIgaW4gZGF0YS5yb2xlLnVzZXJfcm9sZXNbaW5wdXQudXNlcl0KCiMgdXNlcl9pc19ncmFudGVkIGlzIGEgc2V0IG9mIGdyYW50cyBmb3IgdGhlIHVzZXIgaWRlbnRpZmllZCBpbiB0aGUgcmVxdWVzdC4KIyBUaGUgYGdyYW50YCB3aWxsIGJlIGNvbnRhaW5lZCBpZiB0aGUgc2V0IGB1c2VyX2lzX2dyYW50ZWRgIGZvciBldmVyeS4uLgp1c2VyX2lzX2dyYW50ZWQgY29udGFpbnMgZ3JhbnQgaWYgewogICAgICAgICMgYHJvbGVgIGFzc2lnbmVkIGFuIGVsZW1lbnQgb2YgdGhlIHVzZXJfcm9sZXMgZm9yIHRoaXMgdXNlci4uLgogICAgICAgIHNvbWUgcm9sZSBpbiBkYXRhLnJvbGUudXNlcl9yb2xlc1tpbnB1dC51c2VyXQoKICAgICAgICAjIGBncmFudGAgYXNzaWduZWQgYSBzaW5nbGUgZ3JhbnQgZnJvbSB0aGUgZ3JhbnRzIGxpc3QgZm9yICdyb2xlJy4uLgogICAgICAgIHNvbWUgZ3JhbnQgaW4gZGF0YS5yb2xlLnJvbGVfZ3JhbnRzW3JvbGVdCn0KCiMgICAgICAgKiBSZWdvIGNvbXBhcmlzb24gdG8gb3RoZXIgc3lzdGVtczogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC9jb21wYXJpc29uLXRvLW90aGVyLXN5c3RlbXMvCiMgICAgICAgKiBSZWdvIEl0ZXJhdGlvbjogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC8jaXRlcmF0aW9uCgo="},
+			Data:   map[string]string{"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K"},
+		},
+	}
+
+	//Mocking the CreateBundle
+	createBundleFuncVar = func(execCmd func(string, ...string) *exec.Cmd, toscaPolicy model.ToscaPolicy) (string, error) {
+		return "", nil
+	}
+	err := verifyPolicyByBundleCreation(policy)
+	assert.NoError(t, err)
+
+}
+
+func TestVerifyPolicyByBundleCreation_getDirEmpty(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{},
+			Data:   map[string]string{},
+		},
+	}
+
+	//Mocking the CreateBundle
+	err := verifyPolicyByBundleCreation(policy)
+	assert.Error(t, err)
+
+}
+
+func TestVerifyPolicyByBundleCreation_BundleFailure(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"role": "cGFja2FnZSByb2xlCgppbXBvcnQgcmVnby52MQoKIyBCeSBkZWZhdWx0LCBkZW55IHJlcXVlc3RzLgpkZWZhdWx0IGFsbG93IDo9IGZhbHNlCgojIEFsbG93IGFkbWlucyB0byBkbyBhbnl0aGluZy4KYWxsb3cgaWYgdXNlcl9pc19hZG1pbgoKIyBBbGxvdyB0aGUgYWN0aW9uIGlmIHRoZSB1c2VyIGlzIGdyYW50ZWQgcGVybWlzc2lvbiB0byBwZXJmb3JtIHRoZSBhY3Rpb24uCmFsbG93IGlmIHsKICAgICAgICAjIEZpbmQgZ3JhbnRzIGZvciB0aGUgdXNlci4KICAgICAgICBzb21lIGdyYW50IGluIHVzZXJfaXNfZ3JhbnRlZAoKICAgICAgICAjIENoZWNrIGlmIHRoZSBncmFudCBwZXJtaXRzIHRoZSBhY3Rpb24uCiAgICAgICAgaW5wdXQuYWN0aW9uID09IGdyYW50LmFjdGlvbgogICAgICAgIGlucHV0LnR5cGUgPT0gZ3JhbnQudHlwZQp9CgojIHVzZXJfaXNfYWRtaW4gaXMgdHJ1ZSBpZiAiYWRtaW4iIGlzIGFtb25nIHRoZSB1c2VyJ3Mgcm9sZXMgYXMgcGVyIGRhdGEudXNlcl9yb2xlcwp1c2VyX2lzX2FkbWluIGlmICJhZG1pbiIgaW4gZGF0YS5yb2xlLnVzZXJfcm9sZXNbaW5wdXQudXNlcl0KCiMgdXNlcl9pc19ncmFudGVkIGlzIGEgc2V0IG9mIGdyYW50cyBmb3IgdGhlIHVzZXIgaWRlbnRpZmllZCBpbiB0aGUgcmVxdWVzdC4KIyBUaGUgYGdyYW50YCB3aWxsIGJlIGNvbnRhaW5lZCBpZiB0aGUgc2V0IGB1c2VyX2lzX2dyYW50ZWRgIGZvciBldmVyeS4uLgp1c2VyX2lzX2dyYW50ZWQgY29udGFpbnMgZ3JhbnQgaWYgewogICAgICAgICMgYHJvbGVgIGFzc2lnbmVkIGFuIGVsZW1lbnQgb2YgdGhlIHVzZXJfcm9sZXMgZm9yIHRoaXMgdXNlci4uLgogICAgICAgIHNvbWUgcm9sZSBpbiBkYXRhLnJvbGUudXNlcl9yb2xlc1tpbnB1dC51c2VyXQoKICAgICAgICAjIGBncmFudGAgYXNzaWduZWQgYSBzaW5nbGUgZ3JhbnQgZnJvbSB0aGUgZ3JhbnRzIGxpc3QgZm9yICdyb2xlJy4uLgogICAgICAgIHNvbWUgZ3JhbnQgaW4gZGF0YS5yb2xlLnJvbGVfZ3JhbnRzW3JvbGVdCn0KCiMgICAgICAgKiBSZWdvIGNvbXBhcmlzb24gdG8gb3RoZXIgc3lzdGVtczogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC9jb21wYXJpc29uLXRvLW90aGVyLXN5c3RlbXMvCiMgICAgICAgKiBSZWdvIEl0ZXJhdGlvbjogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC8jaXRlcmF0aW9uCgo="},
+			Data:   map[string]string{"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K"},
+		},
+	}
+
+	//Mocking the CreateBundle
+	createBundleFuncVar = func(execCmd func(string, ...string) *exec.Cmd, toscaPolicy model.ToscaPolicy) (string, error) {
+		return "", errors.New("Fail to Initialize Bundle")
+	}
+	err := verifyPolicyByBundleCreation(policy)
+	assert.Error(t, err)
+
+}
+
+func TestCheckIfPolicyAlreadyDeployed_PolicymapEmpty(t *testing.T) {
+
+	// Sample data for testing
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{Name: "TestPolicy1"},
+			{Name: "TestPolicy2"},
+		},
+	}
+	// Test case 1: No deployed policies
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": []}` // Simulating an empty LastDeployedPolicies
+	result := checkIfPolicyAlreadyDeployed(pdpUpdate)
+	assert.Equal(t, pdpUpdate.PoliciesToBeDeployed, result)
+}
+
+func TestCheckIfPolicyAlreadyDeployed_ExistingPolicy(t *testing.T) {
+
+	// Sample data for testing
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{Name: "TestPolicy1", Version: "1.0.0"},
+			{Name: "TestPolicy2", Version: "1.0.0"},
+		},
+	}
+	// Test case 1: No deployed policies
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["cell.consis"],"policy": ["cell.consis"],"policy-id": "cdll.consis","policy-version": "1.0.0"},{"data": ["parent"],"policy": ["parent"],"policy-id": "TestPolicy1","policy-version": "1.0.0"}]}` // Reset to valid case
+	result := checkIfPolicyAlreadyDeployed(pdpUpdate)
+	assert.NotEqual(t, pdpUpdate.PoliciesToBeDeployed, result)
+}
+
+func TestCreateAndStorePolicyData_Success(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"role": "cGFja2FnZSByb2xlCgppbXBvcnQgcmVnby52MQoKIyBCeSBkZWZhdWx0LCBkZW55IHJlcXVlc3RzLgpkZWZhdWx0IGFsbG93IDo9IGZhbHNlCgojIEFsbG93IGFkbWlucyB0byBkbyBhbnl0aGluZy4KYWxsb3cgaWYgdXNlcl9pc19hZG1pbgoKIyBBbGxvdyB0aGUgYWN0aW9uIGlmIHRoZSB1c2VyIGlzIGdyYW50ZWQgcGVybWlzc2lvbiB0byBwZXJmb3JtIHRoZSBhY3Rpb24uCmFsbG93IGlmIHsKICAgICAgICAjIEZpbmQgZ3JhbnRzIGZvciB0aGUgdXNlci4KICAgICAgICBzb21lIGdyYW50IGluIHVzZXJfaXNfZ3JhbnRlZAoKICAgICAgICAjIENoZWNrIGlmIHRoZSBncmFudCBwZXJtaXRzIHRoZSBhY3Rpb24uCiAgICAgICAgaW5wdXQuYWN0aW9uID09IGdyYW50LmFjdGlvbgogICAgICAgIGlucHV0LnR5cGUgPT0gZ3JhbnQudHlwZQp9CgojIHVzZXJfaXNfYWRtaW4gaXMgdHJ1ZSBpZiAiYWRtaW4iIGlzIGFtb25nIHRoZSB1c2VyJ3Mgcm9sZXMgYXMgcGVyIGRhdGEudXNlcl9yb2xlcwp1c2VyX2lzX2FkbWluIGlmICJhZG1pbiIgaW4gZGF0YS5yb2xlLnVzZXJfcm9sZXNbaW5wdXQudXNlcl0KCiMgdXNlcl9pc19ncmFudGVkIGlzIGEgc2V0IG9mIGdyYW50cyBmb3IgdGhlIHVzZXIgaWRlbnRpZmllZCBpbiB0aGUgcmVxdWVzdC4KIyBUaGUgYGdyYW50YCB3aWxsIGJlIGNvbnRhaW5lZCBpZiB0aGUgc2V0IGB1c2VyX2lzX2dyYW50ZWRgIGZvciBldmVyeS4uLgp1c2VyX2lzX2dyYW50ZWQgY29udGFpbnMgZ3JhbnQgaWYgewogICAgICAgICMgYHJvbGVgIGFzc2lnbmVkIGFuIGVsZW1lbnQgb2YgdGhlIHVzZXJfcm9sZXMgZm9yIHRoaXMgdXNlci4uLgogICAgICAgIHNvbWUgcm9sZSBpbiBkYXRhLnJvbGUudXNlcl9yb2xlc1tpbnB1dC51c2VyXQoKICAgICAgICAjIGBncmFudGAgYXNzaWduZWQgYSBzaW5nbGUgZ3JhbnQgZnJvbSB0aGUgZ3JhbnRzIGxpc3QgZm9yICdyb2xlJy4uLgogICAgICAgIHNvbWUgZ3JhbnQgaW4gZGF0YS5yb2xlLnJvbGVfZ3JhbnRzW3JvbGVdCn0KCiMgICAgICAgKiBSZWdvIGNvbXBhcmlzb24gdG8gb3RoZXIgc3lzdGVtczogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC9jb21wYXJpc29uLXRvLW90aGVyLXN5c3RlbXMvCiMgICAgICAgKiBSZWdvIEl0ZXJhdGlvbjogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC8jaXRlcmF0aW9uCgo="},
+			Data:   map[string]string{"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K"},
+		},
+	}
+
+	// Assign mock functions
+	extractAndDecodePoliciesVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) { return nil, []string{}, nil }
+	createPolicyDirectoriesVar = func(map[string]string) error { return nil }
+	createDataDirectoriesVar = func(map[string]string) error { return nil }
+	// Call function under test
+	err := createAndStorePolicyData(policy)
+	// Verify no errors
+	assert.NoError(t, err)
+}
+
+func TestCreateAndStorePolicyData_FailToExtract(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"role": "cGFja2FnZSByb2xlCgppbXBvcnQgcmVnby52MQoKIyBCeSBkZWZhdWx0LCBkZW55IHJlcXVlc3RzLgpkZWZhdWx0IGFsbG93IDo9IGZhbHNlCgojIEFsbG93IGFkbWlucyB0byBkbyBhbnl0aGluZy4KYWxsb3cgaWYgdXNlcl9pc19hZG1pbgoKIyBBbGxvdyB0aGUgYWN0aW9uIGlmIHRoZSB1c2VyIGlzIGdyYW50ZWQgcGVybWlzc2lvbiB0byBwZXJmb3JtIHRoZSBhY3Rpb24uCmFsbG93IGlmIHsKICAgICAgICAjIEZpbmQgZ3JhbnRzIGZvciB0aGUgdXNlci4KICAgICAgICBzb21lIGdyYW50IGluIHVzZXJfaXNfZ3JhbnRlZAoKICAgICAgICAjIENoZWNrIGlmIHRoZSBncmFudCBwZXJtaXRzIHRoZSBhY3Rpb24uCiAgICAgICAgaW5wdXQuYWN0aW9uID09IGdyYW50LmFjdGlvbgogICAgICAgIGlucHV0LnR5cGUgPT0gZ3JhbnQudHlwZQp9CgojIHVzZXJfaXNfYWRtaW4gaXMgdHJ1ZSBpZiAiYWRtaW4iIGlzIGFtb25nIHRoZSB1c2VyJ3Mgcm9sZXMgYXMgcGVyIGRhdGEudXNlcl9yb2xlcwp1c2VyX2lzX2FkbWluIGlmICJhZG1pbiIgaW4gZGF0YS5yb2xlLnVzZXJfcm9sZXNbaW5wdXQudXNlcl0KCiMgdXNlcl9pc19ncmFudGVkIGlzIGEgc2V0IG9mIGdyYW50cyBmb3IgdGhlIHVzZXIgaWRlbnRpZmllZCBpbiB0aGUgcmVxdWVzdC4KIyBUaGUgYGdyYW50YCB3aWxsIGJlIGNvbnRhaW5lZCBpZiB0aGUgc2V0IGB1c2VyX2lzX2dyYW50ZWRgIGZvciBldmVyeS4uLgp1c2VyX2lzX2dyYW50ZWQgY29udGFpbnMgZ3JhbnQgaWYgewogICAgICAgICMgYHJvbGVgIGFzc2lnbmVkIGFuIGVsZW1lbnQgb2YgdGhlIHVzZXJfcm9sZXMgZm9yIHRoaXMgdXNlci4uLgogICAgICAgIHNvbWUgcm9sZSBpbiBkYXRhLnJvbGUudXNlcl9yb2xlc1tpbnB1dC51c2VyXQoKICAgICAgICAjIGBncmFudGAgYXNzaWduZWQgYSBzaW5nbGUgZ3JhbnQgZnJvbSB0aGUgZ3JhbnRzIGxpc3QgZm9yICdyb2xlJy4uLgogICAgICAgIHNvbWUgZ3JhbnQgaW4gZGF0YS5yb2xlLnJvbGVfZ3JhbnRzW3JvbGVdCn0KCiMgICAgICAgKiBSZWdvIGNvbXBhcmlzb24gdG8gb3RoZXIgc3lzdGVtczogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC9jb21wYXJpc29uLXRvLW90aGVyLXN5c3RlbXMvCiMgICAgICAgKiBSZWdvIEl0ZXJhdGlvbjogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC8jaXRlcmF0aW9uCgo="},
+			Data:   map[string]string{"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K"},
+		},
+	}
+
+	//Mocking the CreateBundle
+	// Assign mock functions
+	extractAndDecodePoliciesVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) {
+		return nil, []string{}, errors.New("Failure in extracting")
+	}
+	// Call function under test
+	err := createAndStorePolicyData(policy)
+	// Verify no errors
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "Failure in extracting")
+}
+
+func TestCreateAndStorePolicyData_FailToCreatePolicyDirectories(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"role": "cGFja2FnZSByb2xlCgppbXBvcnQgcmVnby52MQoKIyBCeSBkZWZhdWx0LCBkZW55IHJlcXVlc3RzLgpkZWZhdWx0IGFsbG93IDo9IGZhbHNlCgojIEFsbG93IGFkbWlucyB0byBkbyBhbnl0aGluZy4KYWxsb3cgaWYgdXNlcl9pc19hZG1pbgoKIyBBbGxvdyB0aGUgYWN0aW9uIGlmIHRoZSB1c2VyIGlzIGdyYW50ZWQgcGVybWlzc2lvbiB0byBwZXJmb3JtIHRoZSBhY3Rpb24uCmFsbG93IGlmIHsKICAgICAgICAjIEZpbmQgZ3JhbnRzIGZvciB0aGUgdXNlci4KICAgICAgICBzb21lIGdyYW50IGluIHVzZXJfaXNfZ3JhbnRlZAoKICAgICAgICAjIENoZWNrIGlmIHRoZSBncmFudCBwZXJtaXRzIHRoZSBhY3Rpb24uCiAgICAgICAgaW5wdXQuYWN0aW9uID09IGdyYW50LmFjdGlvbgogICAgICAgIGlucHV0LnR5cGUgPT0gZ3JhbnQudHlwZQp9CgojIHVzZXJfaXNfYWRtaW4gaXMgdHJ1ZSBpZiAiYWRtaW4iIGlzIGFtb25nIHRoZSB1c2VyJ3Mgcm9sZXMgYXMgcGVyIGRhdGEudXNlcl9yb2xlcwp1c2VyX2lzX2FkbWluIGlmICJhZG1pbiIgaW4gZGF0YS5yb2xlLnVzZXJfcm9sZXNbaW5wdXQudXNlcl0KCiMgdXNlcl9pc19ncmFudGVkIGlzIGEgc2V0IG9mIGdyYW50cyBmb3IgdGhlIHVzZXIgaWRlbnRpZmllZCBpbiB0aGUgcmVxdWVzdC4KIyBUaGUgYGdyYW50YCB3aWxsIGJlIGNvbnRhaW5lZCBpZiB0aGUgc2V0IGB1c2VyX2lzX2dyYW50ZWRgIGZvciBldmVyeS4uLgp1c2VyX2lzX2dyYW50ZWQgY29udGFpbnMgZ3JhbnQgaWYgewogICAgICAgICMgYHJvbGVgIGFzc2lnbmVkIGFuIGVsZW1lbnQgb2YgdGhlIHVzZXJfcm9sZXMgZm9yIHRoaXMgdXNlci4uLgogICAgICAgIHNvbWUgcm9sZSBpbiBkYXRhLnJvbGUudXNlcl9yb2xlc1tpbnB1dC51c2VyXQoKICAgICAgICAjIGBncmFudGAgYXNzaWduZWQgYSBzaW5nbGUgZ3JhbnQgZnJvbSB0aGUgZ3JhbnRzIGxpc3QgZm9yICdyb2xlJy4uLgogICAgICAgIHNvbWUgZ3JhbnQgaW4gZGF0YS5yb2xlLnJvbGVfZ3JhbnRzW3JvbGVdCn0KCiMgICAgICAgKiBSZWdvIGNvbXBhcmlzb24gdG8gb3RoZXIgc3lzdGVtczogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC9jb21wYXJpc29uLXRvLW90aGVyLXN5c3RlbXMvCiMgICAgICAgKiBSZWdvIEl0ZXJhdGlvbjogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC8jaXRlcmF0aW9uCgo="},
+			Data:   map[string]string{"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K"},
+		},
+	}
+
+	//Mocking the CreateBundle
+	extractAndDecodePoliciesVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) { return nil, []string{}, nil }
+	createPolicyDirectoriesVar = func(map[string]string) error { return errors.New("failed to create directories") }
+	// Call function under test
+	err := createAndStorePolicyData(policy)
+	// Verify error
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "failed to create directories")
+}
+
+func TestCreateAndStorePolicyData_FailToExtractData(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"role": "cGFja2FnZSByb2xlCgppbXBvcnQgcmVnby52MQoKIyBCeSBkZWZhdWx0LCBkZW55IHJlcXVlc3RzLgpkZWZhdWx0IGFsbG93IDo9IGZhbHNlCgojIEFsbG93IGFkbWlucyB0byBkbyBhbnl0aGluZy4KYWxsb3cgaWYgdXNlcl9pc19hZG1pbgoKIyBBbGxvdyB0aGUgYWN0aW9uIGlmIHRoZSB1c2VyIGlzIGdyYW50ZWQgcGVybWlzc2lvbiB0byBwZXJmb3JtIHRoZSBhY3Rpb24uCmFsbG93IGlmIHsKICAgICAgICAjIEZpbmQgZ3JhbnRzIGZvciB0aGUgdXNlci4KICAgICAgICBzb21lIGdyYW50IGluIHVzZXJfaXNfZ3JhbnRlZAoKICAgICAgICAjIENoZWNrIGlmIHRoZSBncmFudCBwZXJtaXRzIHRoZSBhY3Rpb24uCiAgICAgICAgaW5wdXQuYWN0aW9uID09IGdyYW50LmFjdGlvbgogICAgICAgIGlucHV0LnR5cGUgPT0gZ3JhbnQudHlwZQp9CgojIHVzZXJfaXNfYWRtaW4gaXMgdHJ1ZSBpZiAiYWRtaW4iIGlzIGFtb25nIHRoZSB1c2VyJ3Mgcm9sZXMgYXMgcGVyIGRhdGEudXNlcl9yb2xlcwp1c2VyX2lzX2FkbWluIGlmICJhZG1pbiIgaW4gZGF0YS5yb2xlLnVzZXJfcm9sZXNbaW5wdXQudXNlcl0KCiMgdXNlcl9pc19ncmFudGVkIGlzIGEgc2V0IG9mIGdyYW50cyBmb3IgdGhlIHVzZXIgaWRlbnRpZmllZCBpbiB0aGUgcmVxdWVzdC4KIyBUaGUgYGdyYW50YCB3aWxsIGJlIGNvbnRhaW5lZCBpZiB0aGUgc2V0IGB1c2VyX2lzX2dyYW50ZWRgIGZvciBldmVyeS4uLgp1c2VyX2lzX2dyYW50ZWQgY29udGFpbnMgZ3JhbnQgaWYgewogICAgICAgICMgYHJvbGVgIGFzc2lnbmVkIGFuIGVsZW1lbnQgb2YgdGhlIHVzZXJfcm9sZXMgZm9yIHRoaXMgdXNlci4uLgogICAgICAgIHNvbWUgcm9sZSBpbiBkYXRhLnJvbGUudXNlcl9yb2xlc1tpbnB1dC51c2VyXQoKICAgICAgICAjIGBncmFudGAgYXNzaWduZWQgYSBzaW5nbGUgZ3JhbnQgZnJvbSB0aGUgZ3JhbnRzIGxpc3QgZm9yICdyb2xlJy4uLgogICAgICAgIHNvbWUgZ3JhbnQgaW4gZGF0YS5yb2xlLnJvbGVfZ3JhbnRzW3JvbGVdCn0KCiMgICAgICAgKiBSZWdvIGNvbXBhcmlzb24gdG8gb3RoZXIgc3lzdGVtczogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC9jb21wYXJpc29uLXRvLW90aGVyLXN5c3RlbXMvCiMgICAgICAgKiBSZWdvIEl0ZXJhdGlvbjogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC8jaXRlcmF0aW9uCgo="},
+			Data:   map[string]string{"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K"},
+		},
+	}
+
+	//Mocking the CreateBundle
+	// Assign mock functions
+	extractAndDecodePoliciesVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) { return nil, []string{}, nil }
+	createPolicyDirectoriesVar = func(map[string]string) error { return nil }
+	extractAndDecodeDataVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) {
+		return nil, []string{}, errors.New("data extraction error")
+	}
+	// Call function under test
+	err := createAndStorePolicyData(policy)
+	// Verify error
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "data extraction error")
+}
+func TestCreateAndStorePolicyData_FailToCreateDataDirectories(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name: "role",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{"role": "cGFja2FnZSByb2xlCgppbXBvcnQgcmVnby52MQoKIyBCeSBkZWZhdWx0LCBkZW55IHJlcXVlc3RzLgpkZWZhdWx0IGFsbG93IDo9IGZhbHNlCgojIEFsbG93IGFkbWlucyB0byBkbyBhbnl0aGluZy4KYWxsb3cgaWYgdXNlcl9pc19hZG1pbgoKIyBBbGxvdyB0aGUgYWN0aW9uIGlmIHRoZSB1c2VyIGlzIGdyYW50ZWQgcGVybWlzc2lvbiB0byBwZXJmb3JtIHRoZSBhY3Rpb24uCmFsbG93IGlmIHsKICAgICAgICAjIEZpbmQgZ3JhbnRzIGZvciB0aGUgdXNlci4KICAgICAgICBzb21lIGdyYW50IGluIHVzZXJfaXNfZ3JhbnRlZAoKICAgICAgICAjIENoZWNrIGlmIHRoZSBncmFudCBwZXJtaXRzIHRoZSBhY3Rpb24uCiAgICAgICAgaW5wdXQuYWN0aW9uID09IGdyYW50LmFjdGlvbgogICAgICAgIGlucHV0LnR5cGUgPT0gZ3JhbnQudHlwZQp9CgojIHVzZXJfaXNfYWRtaW4gaXMgdHJ1ZSBpZiAiYWRtaW4iIGlzIGFtb25nIHRoZSB1c2VyJ3Mgcm9sZXMgYXMgcGVyIGRhdGEudXNlcl9yb2xlcwp1c2VyX2lzX2FkbWluIGlmICJhZG1pbiIgaW4gZGF0YS5yb2xlLnVzZXJfcm9sZXNbaW5wdXQudXNlcl0KCiMgdXNlcl9pc19ncmFudGVkIGlzIGEgc2V0IG9mIGdyYW50cyBmb3IgdGhlIHVzZXIgaWRlbnRpZmllZCBpbiB0aGUgcmVxdWVzdC4KIyBUaGUgYGdyYW50YCB3aWxsIGJlIGNvbnRhaW5lZCBpZiB0aGUgc2V0IGB1c2VyX2lzX2dyYW50ZWRgIGZvciBldmVyeS4uLgp1c2VyX2lzX2dyYW50ZWQgY29udGFpbnMgZ3JhbnQgaWYgewogICAgICAgICMgYHJvbGVgIGFzc2lnbmVkIGFuIGVsZW1lbnQgb2YgdGhlIHVzZXJfcm9sZXMgZm9yIHRoaXMgdXNlci4uLgogICAgICAgIHNvbWUgcm9sZSBpbiBkYXRhLnJvbGUudXNlcl9yb2xlc1tpbnB1dC51c2VyXQoKICAgICAgICAjIGBncmFudGAgYXNzaWduZWQgYSBzaW5nbGUgZ3JhbnQgZnJvbSB0aGUgZ3JhbnRzIGxpc3QgZm9yICdyb2xlJy4uLgogICAgICAgIHNvbWUgZ3JhbnQgaW4gZGF0YS5yb2xlLnJvbGVfZ3JhbnRzW3JvbGVdCn0KCiMgICAgICAgKiBSZWdvIGNvbXBhcmlzb24gdG8gb3RoZXIgc3lzdGVtczogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC9jb21wYXJpc29uLXRvLW90aGVyLXN5c3RlbXMvCiMgICAgICAgKiBSZWdvIEl0ZXJhdGlvbjogaHR0cHM6Ly93d3cub3BlbnBvbGljeWFnZW50Lm9yZy9kb2NzL2xhdGVzdC8jaXRlcmF0aW9uCgo="},
+			Data:   map[string]string{"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K"},
+		},
+	}
+
+	//Mocking the CreateBundle
+	// Assign mock functions
+	extractAndDecodePoliciesVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) { return nil, []string{}, nil }
+	createPolicyDirectoriesVar = func(map[string]string) error { return nil }
+	extractAndDecodeDataVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) { return nil, []string{}, nil }
+	createDataDirectoriesVar = func(map[string]string) error { return errors.New("failed to create data directories") }
+	// Call function under test
+	err := createAndStorePolicyData(policy)
+	// Verify error
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "failed to create data directories")
+}
+
+func TestHandlePolicyDeployment_Success(t *testing.T) {
+
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+					        "node.role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+					Policy: map[string]string{
+						"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+				},
+				Name:    "role",
+				Version: "1.0",
+				Metadata: model.Metadata{
+					PolicyID:      "role",
+					PolicyVersion: "1.0",
+				},
+			},
+		},
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+		Name:                   "Test Pdp Update",
+	}
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+	//Mocking fucntions
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{}]}` // Reset to valid case
+	createAndStorePolicyDataVar = func(policy model.ToscaPolicy) error { return nil }
+	createBundleFuncVar = func(execCmd func(string, ...string) *exec.Cmd, toscaPolicy model.ToscaPolicy) (string, error) {
+		return "", nil
+	}
+	validateParentPolicyVar = func(policy model.ToscaPolicy) (bool, error) { return true, nil }
+	upsertPolicyFunc = func(model.ToscaPolicy) error { return nil }
+	upsertDataFunc = func(model.ToscaPolicy) error { return nil }
+
+	err, _ := handlePolicyDeployment(pdpUpdate, mockSender)
+	assert.Nil(t, err)
+}
+
+func TestHandlePolicyDeployment_ValidateTosca(t *testing.T) {
+
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"node.role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+					Policy: map[string]string{
+						"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+				},
+				Name:    "role",
+				Version: "1.0",
+				Metadata: model.Metadata{
+					PolicyID:      "role2",
+					PolicyVersion: "1.0",
+				},
+			},
+		},
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+		Name:                   "Test Pdp Update",
+	}
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{}]}` // Reset to valid case
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+	err, _ := handlePolicyDeployment(pdpUpdate, mockSender)
+	found := false
+	for _, message := range err {
+		if strings.Contains(message, "Tosca Policy Validation failed") {
+			found = true
+			break
+		}
+	}
+	assert.True(t, found, "Error Message Doesn't Match")
+}
+
+func TestHandlePolicyDeployment_ValidateParent(t *testing.T) {
+
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"node.role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+					Policy: map[string]string{
+						"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+				},
+				Name:    "role",
+				Version: "1.0",
+				Metadata: model.Metadata{
+					PolicyID:      "role",
+					PolicyVersion: "1.0",
+				},
+			},
+		},
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+		Name:                   "Test Pdp Update",
+	}
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["role.hello"],"policy": ["role.hello"],"policy-id": "role.hello","policy-version": "1.0.0"}]}` // Reset to valid case
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+	validateParentPolicyVar = func(policy model.ToscaPolicy) (bool, error) {
+		return false, errors.New("parent policy already present")
+	}
+	err, _ := handlePolicyDeployment(pdpUpdate, mockSender)
+	found := false
+	for _, message := range err {
+		if strings.Contains(message, "parent policy already present") {
+			found = true
+			break
+		}
+	}
+	assert.True(t, found, "Error Message Doesn't Match")
+}
+
+func TestHandlePolicyDeployment_StorePolicyDataFailure(t *testing.T) {
+
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"node.role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+					Policy: map[string]string{
+						"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+				},
+				Name:    "role",
+				Version: "1.0",
+				Metadata: model.Metadata{
+					PolicyID:      "role",
+					PolicyVersion: "1.0",
+				},
+			},
+		},
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+		Name:                   "Test Pdp Update",
+	}
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+	//Mocking fucntions
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{}]}` // Reset to valid case
+	createAndStorePolicyDataVar = func(policy model.ToscaPolicy) error { return errors.New("Failure in StorePolicyData") }
+	validateParentPolicyVar = func(policy model.ToscaPolicy) (bool, error) { return true, nil }
+	err, _ := handlePolicyDeployment(pdpUpdate, mockSender)
+	found := false
+	for _, message := range err {
+		if strings.Contains(message, "Failure in StorePolicyData") {
+			found = true
+			break
+		}
+	}
+	assert.True(t, found, "Error Message Doesn't Match")
+}
+
+func TestHandlePolicyDeployment_VerifyBundleFailure(t *testing.T) {
+
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"node.role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+					Policy: map[string]string{
+						"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+				},
+				Name:    "role",
+				Version: "1.0",
+				Metadata: model.Metadata{
+					PolicyID:      "role",
+					PolicyVersion: "1.0",
+				},
+			},
+		},
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+		Name:                   "Test Pdp Update",
+	}
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+	//Mocking fucntions
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{}]}` // Reset to valid case
+	createAndStorePolicyDataVar = func(policy model.ToscaPolicy) error { return nil }
+	validateParentPolicyVar = func(policy model.ToscaPolicy) (bool, error) { return true, nil }
+	createBundleFuncVar = func(execCmd func(string, ...string) *exec.Cmd, toscaPolicy model.ToscaPolicy) (string, error) {
+		return "", errors.New("Failed to Bundle")
+	}
+	err, _ := handlePolicyDeployment(pdpUpdate, mockSender)
+	found := false
+	for _, message := range err {
+		if strings.Contains(message, "Failed to Bundle") {
+			found = true
+			break
+		}
+	}
+	assert.True(t, found, "Error Message Doesn't Match")
+}
+
+func TestHandlePolicyDeployment_upsertPolicyAndDataFailure(t *testing.T) {
+
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{
+				Properties: model.PolicyProperties{
+					Data: map[string]string{
+						"node.role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+					Policy: map[string]string{
+						"role": "ewogICAgInVzZXJfcm9sZXMiOiB7CiAgICAgICAgImFsaWNlIjogWwogICAgICAgICAgICAiYWRtaW4iCiAgICAgICAgXSwKICAgICAgICAiYm9iIjogWwogICAgICAgICAgICAiZW1wbG95ZWUiLAogICAgICAgICAgICAiYmlsbGluZyIKICAgICAgICBdLAogICAgICAgICJldmUiOiBbCiAgICAgICAgICAgICJjdXN0b21lciIKICAgICAgICBdCiAgICB9LAogICAgInJvbGVfZ3JhbnRzIjogewogICAgICAgICJjdXN0b21lciI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImNhdCIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJhZG9wdCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAiYWRvcHQiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiZW1wbG95ZWUiOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJkb2ciCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAicmVhZCIsCiAgICAgICAgICAgICAgICAidHlwZSI6ICJjYXQiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImRvZyIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJ1cGRhdGUiLAogICAgICAgICAgICAgICAgInR5cGUiOiAiY2F0IgogICAgICAgICAgICB9CiAgICAgICAgXSwKICAgICAgICAiYmlsbGluZyI6IFsKICAgICAgICAgICAgewogICAgICAgICAgICAgICAgImFjdGlvbiI6ICJyZWFkIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICJhY3Rpb24iOiAidXBkYXRlIiwKICAgICAgICAgICAgICAgICJ0eXBlIjogImZpbmFuY2UiCiAgICAgICAgICAgIH0KICAgICAgICBdCiAgICB9Cn0K",
+					},
+				},
+				Name:    "role",
+				Version: "1.0",
+				Metadata: model.Metadata{
+					PolicyID:      "role",
+					PolicyVersion: "1.0",
+				},
+			},
+		},
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+		Name:                   "Test Pdp Update",
+	}
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+	//Mocking fucntions
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{}]}` // Reset to valid case
+	createAndStorePolicyDataVar = func(policy model.ToscaPolicy) error { return nil }
+	validateParentPolicyVar = func(policy model.ToscaPolicy) (bool, error) { return true, nil }
+	createBundleFuncVar = func(execCmd func(string, ...string) *exec.Cmd, toscaPolicy model.ToscaPolicy) (string, error) {
+		return "", nil
+	}
+	upsertPolicyFunc = func(model.ToscaPolicy) error { return errors.New("SDKError") }
+	err, _ := handlePolicyDeployment(pdpUpdate, mockSender)
+	found := false
+	for _, message := range err {
+		if strings.Contains(message, "SDKError") {
+			found = true
+			break
+		}
+	}
+	assert.True(t, found, "Error Message Doesn't Match")
+}
+
+func TestCreatePolicyDirectories_testing(t *testing.T) {
+	// Create a temporary directory under /tmp
+	basePolicyDir = "test_policy_dirs"
+	err := os.MkdirAll(basePolicyDir, os.ModePerm)
+	assert.NoError(t, err, "Failed to create base policy directory")
+	defer os.RemoveAll(basePolicyDir) // Cleanup after the test
+	// Example decoded policies to test
+	decodedPolicies := map[string]string{
+		"test.policy":    "package test\n\nsome_rule = true",
+		"another.policy": "package another\n\nanother_rule = false",
+	}
+	// Call the function to test
+	utils.CreateDirectoryVar = func(dirPath string) error { os.MkdirAll(dirPath, os.ModePerm); return nil }
+	err = createPolicyDirectories(decodedPolicies)
+	// Assertions
+	assert.NoError(t, err, "Expected no error during policy directory creation")
+	// Verify that directories and files were created
+	for key := range decodedPolicies {
+		policyDir := filepath.Join(basePolicyDir, filepath.Join(strings.Split(key, ".")...))
+		// Check if the directory was created
+		_, err := os.Stat(policyDir)
+		assert.NoError(t, err, "Expected policy directory to be created: %s", policyDir)
+		// Check if the policy.rego file was created
+		policyFile := filepath.Join(policyDir, "policy.rego")
+		_, err = os.Stat(policyFile)
+		assert.NoError(t, err, "Expected policy file to be created: %s", policyFile)
+	}
+}
+
+func TestCreatePolicyDirectories_testingFailure(t *testing.T) {
+	// Create a temporary directory under /tmp
+	basePolicyDir = "test_policy_dirs"
+	err := os.MkdirAll(basePolicyDir, os.ModePerm)
+	assert.NoError(t, err, "Failed to create base policy directory")
+	defer os.RemoveAll(basePolicyDir) // Cleanup after the test
+	// Example decoded policies to test
+	decodedPolicies := map[string]string{
+		"test.policy":    "package test\n\nsome_rule = true",
+		"another.policy": "package another\n\nanother_rule = false",
+	}
+	// Call the function to test
+	utils.CreateDirectoryVar = func(dirPath string) error { return errors.New("Fail to Create Dir") }
+	err = createPolicyDirectories(decodedPolicies)
+	// Assertions
+	assert.Error(t, err, "Expected no error during policy directory creation")
+}
+
+func TestCreatePolicyDirectories_testingSaveFailure(t *testing.T) {
+	// Create a temporary directory under /tmp
+	basePolicyDir = "test_policy_dirs"
+	err := os.MkdirAll(basePolicyDir, os.ModePerm)
+	assert.NoError(t, err, "Failed to create base policy directory")
+	defer os.RemoveAll(basePolicyDir) // Cleanup after the test
+	// Example decoded policies to test
+	decodedPolicies := map[string]string{
+		"test.policy":    "package test\n\nsome_rule = true",
+		"another.policy": "package another\n\nanother_rule = false",
+	}
+	// Call the function to test
+	utils.CreateDirectoryVar = func(dirPath string) error { return nil }
+	err = createPolicyDirectories(decodedPolicies)
+	// Assertions
+	assert.Error(t, err, "Expected no error during policy directory creation")
+}
+
+func TestCreateDataDirectories_testing(t *testing.T) {
+	// Create a temporary directory under /tmp
+	baseDataDir = "test_policy_dirs"
+	err := os.MkdirAll(basePolicyDir, os.ModePerm)
+	assert.NoError(t, err, "Failed to create base policy directory")
+	defer os.RemoveAll(basePolicyDir) // Cleanup after the test
+	// Example decoded policies to test
+	decodedPolicies := map[string]string{
+		"test.policy":    "package test\n\nsome_rule = true",
+		"another.policy": "package another\n\nanother_rule = false",
+	}
+	// Call the function to test
+	utils.CreateDirectoryVar = func(dirPath string) error { os.MkdirAll(dirPath, os.ModePerm); return nil }
+	err = createDataDirectories(decodedPolicies)
+	// Assertions
+	assert.NoError(t, err, "Expected no error during policy directory creation")
+	// Verify that directories and files were created
+	for key := range decodedPolicies {
+		policyDir := filepath.Join(basePolicyDir, filepath.Join(strings.Split(key, ".")...))
+		// Check if the directory was created
+		_, err := os.Stat(policyDir)
+		assert.NoError(t, err, "Expected policy directory to be created: %s", policyDir)
+		// Check if the policy.rego file was created
+		policyFile := filepath.Join(policyDir, "data.json")
+		_, err = os.Stat(policyFile)
+		assert.NoError(t, err, "Expected policy file to be created: %s", policyFile)
+	}
+}
+
+func TestCreateDataDirectories_testingFailure(t *testing.T) {
+	// Create a temporary directory under /tmp
+	baseDataDir = "test_policy_dirs"
+	err := os.MkdirAll(basePolicyDir, os.ModePerm)
+	assert.NoError(t, err, "Failed to create base policy directory")
+	defer os.RemoveAll(basePolicyDir) // Cleanup after the test
+	// Example decoded policies to test
+	decodedPolicies := map[string]string{
+		"test.policy":    "package test\n\nsome_rule = true",
+		"another.policy": "package another\n\nanother_rule = false",
+	}
+	// Call the function to test
+	utils.CreateDirectoryVar = func(dirPath string) error { return errors.New("Fail to Create Dir") }
+	err = createDataDirectories(decodedPolicies)
+	// Assertions
+	assert.Error(t, err, "Expected no error during policy directory creation")
+}
+
+func TestCreateDataDirectories_testingSaveFailure(t *testing.T) {
+	// Create a temporary directory under /tmp
+	baseDataDir = "test_policy_dirs"
+	err := os.MkdirAll(basePolicyDir, os.ModePerm)
+	assert.NoError(t, err, "Failed to create base policy directory")
+	defer os.RemoveAll(basePolicyDir) // Cleanup after the test
+	// Example decoded policies to test
+	decodedPolicies := map[string]string{
+		"test.policy":    "package test\n\nsome_rule = true",
+		"another.policy": "package another\n\nanother_rule = false",
+	}
+	// Call the function to test
+	utils.CreateDirectoryVar = func(dirPath string) error { return nil }
+	err = createDataDirectories(decodedPolicies)
+	// Assertions
+	assert.Error(t, err, "Expected no error during policy directory creation")
+}
+
+// Test function for upsertPolicy
+func TestUpsertPolicy(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name:    "TestPolicy",
+		Version: "1.0.0",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{
+				"policy1": base64.StdEncoding.EncodeToString([]byte("package policy1\ndecoded policy content")),
+			},
+			Data: map[string]string{
+				"key1": base64.StdEncoding.EncodeToString([]byte("value1")),
+				"key2": base64.StdEncoding.EncodeToString([]byte("value2")),
+			},
+		},
+	}
+	//mocking Functions
+	extractAndDecodePoliciesVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) {
+		return map[string]string{"policy1": "Policy De"}, []string{"policy1"}, nil
+	}
+	opasdk.UpsertPolicyVar = func(ctx context.Context, policyID string, policyContent []byte) error { return nil }
+	// Call the function under test
+	err := upsertPolicy(policy)
+	// Test assertions
+	assert.NoError(t, err, "Expected no error during policy upsert")
+}
+
+// Test for failure in UpsertPolicy
+func TestUpsertPolicy_Failure(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name:    "TestPolicy",
+		Version: "1.0.0",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{
+				"policy1": base64.StdEncoding.EncodeToString([]byte("package policy1\ndecoded policy content")),
+			},
+			Data: map[string]string{
+				"key1": base64.StdEncoding.EncodeToString([]byte("value1")),
+				"key2": base64.StdEncoding.EncodeToString([]byte("value2")),
+			},
+		},
+	}
+	//mocking Functions
+	extractAndDecodePoliciesVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) {
+		return map[string]string{"policy1": "Policy De"}, []string{"policy1"}, nil
+	}
+	opasdk.UpsertPolicyVar = func(ctx context.Context, policyID string, policyContent []byte) error {
+		return errors.New("Failure in Upsert SDK")
+	}
+	// Call the function under test
+	err := upsertPolicy(policy)
+	// Testn assertions
+	assert.Error(t, err)
+}
+
+// Test function for upsertPolicy
+func TestUpsertData(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name:    "TestPolicy",
+		Version: "1.0.0",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{
+				"policy1": base64.StdEncoding.EncodeToString([]byte("package policy1\ndecoded policy content")),
+			},
+			Data: map[string]string{
+				"key1": base64.StdEncoding.EncodeToString([]byte("value1")),
+				"key2": base64.StdEncoding.EncodeToString([]byte("value2")),
+			},
+		},
+	}
+	//mocking Functions
+	extractAndDecodeDataVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) {
+		return map[string]string{"policy1": "{\"user_roles\": {\"alice\": [\"admin\"],\"bob\": [\"employee\",\"billing\"],\"eve\": [\"customer\"]}}"}, []string{"policy1"}, nil
+	}
+	opasdk.WriteDataVar = func(ctx context.Context, dataPath string, data interface{}) error { return nil }
+	// Call the function under test
+	err := upsertData(policy)
+	// Test assertions
+	assert.NoError(t, err)
+}
+
+// Test for failure in UpsertPolicy
+func TestUpsertData_Failure(t *testing.T) {
+	// Sample Tosca Policy
+	policy := model.ToscaPolicy{
+		Name:    "TestPolicy",
+		Version: "1.0.0",
+		Properties: model.PolicyProperties{
+			Policy: map[string]string{
+				"policy1": base64.StdEncoding.EncodeToString([]byte("package policy1\ndecoded policy content")),
+			},
+			Data: map[string]string{
+				"key1": base64.StdEncoding.EncodeToString([]byte("value1")),
+				"key2": base64.StdEncoding.EncodeToString([]byte("value2")),
+			},
+		},
+	}
+	//mocking Functions
+	extractAndDecodeDataVar = func(policy model.ToscaPolicy) (map[string]string, []string, error) {
+		return map[string]string{"policy1": "{\"user_roles\": {\"alice\": [\"admin\"],\"bob\": [\"employee\",\"billing\"],\"eve\": [\"customer\"]}}"}, []string{"policy1"}, nil
+	}
+	opasdk.WriteDataVar = func(ctx context.Context, dataPath string, data interface{}) error {
+		return errors.New("Failure in Write Data in SDK")
+	}
+	// Call the function under test
+	err := upsertData(policy)
+	// Test assertions
+	assert.Error(t, err)
+}
diff --git a/pkg/kafkacomm/handler/pdp_update_message_handler.go b/pkg/kafkacomm/handler/pdp_update_message_handler.go
index 148e5b5..5842c29 100644
--- a/pkg/kafkacomm/handler/pdp_update_message_handler.go
+++ b/pkg/kafkacomm/handler/pdp_update_message_handler.go
@@ -34,9 +34,18 @@ import (
 	"strings"
 )
 
+type (
+	sendSuccessResponseFunc func(p publisher.PdpStatusSender, pdpUpdate *model.PdpUpdate, respMessage string) error
+	sendFailureResponseFunc func(p publisher.PdpStatusSender, pdpUpdate *model.PdpUpdate, respMessage error) error
+	createBundleFuncRef     func(execCmd func(string, ...string) *exec.Cmd, toscaPolicy model.ToscaPolicy) (string, error)
+)
+
 var (
-	basePolicyDir = consts.Policies
-	baseDataDir   = consts.Data
+	basePolicyDir                                  = consts.Policies
+	baseDataDir                                    = consts.Data
+	sendSuccessResponseVar sendSuccessResponseFunc = sendSuccessResponse
+	sendFailureResponseVar sendFailureResponseFunc = sendFailureResponse
+	createBundleFuncVar    createBundleFuncRef     = createBundleFunc
 )
 
 // Handles messages of type PDP_UPDATE sent from the Policy Administration Point (PAP).
@@ -50,7 +59,7 @@ func pdpUpdateMessageHandler(message []byte, p publisher.PdpStatusSender) error
 	if err != nil {
 		log.Debugf("Failed to UnMarshal Messages: %v\n", err)
 		resMessage := fmt.Errorf("PDP Update Failed: %v", err)
-		if err := sendFailureResponse(p, &pdpUpdate, resMessage); err != nil {
+		if err := sendFailureResponseVar(p, &pdpUpdate, resMessage); err != nil {
 			log.Debugf("Failed to send update error response: %v", err)
 			return err
 		}
@@ -61,7 +70,7 @@ func pdpUpdateMessageHandler(message []byte, p publisher.PdpStatusSender) error
 	err = utils.ValidateFieldsStructs(pdpUpdate)
 	if err != nil {
 		resMessage := fmt.Errorf("PDP Update Failed: %v", err)
-		if err := sendFailureResponse(p, &pdpUpdate, resMessage); err != nil {
+		if err := sendFailureResponseVar(p, &pdpUpdate, resMessage); err != nil {
 			log.Debugf("Failed to send update error response: %v", err)
 			return err
 		}
@@ -74,7 +83,7 @@ func pdpUpdateMessageHandler(message []byte, p publisher.PdpStatusSender) error
 	pdpattributes.SetPdpHeartbeatInterval(pdpUpdate.PdpHeartbeatIntervalMs)
 
 	if len(pdpUpdate.PoliciesToBeDeployed) > 0 {
-		failureMessage, successfullyDeployedPolicies := handlePolicyDeployment(pdpUpdate, p)
+		failureMessage, successfullyDeployedPolicies := handlePolicyDeploymentVar(pdpUpdate, p)
 		mapJson, err := policymap.FormatMapofAnyType(successfullyDeployedPolicies)
 		if len(failureMessage) > 0 {
 			failureMessages = append(failureMessages, "{Deployment Errors:"+strings.Join(failureMessage, "")+"}")
@@ -82,7 +91,7 @@ func pdpUpdateMessageHandler(message []byte, p publisher.PdpStatusSender) error
 		if err != nil {
 			failureMessages = append(failureMessages, "|Internal Map Error:"+err.Error()+"|")
 			resMessage := fmt.Errorf("PDP Update Failed: failed to format successfullyDeployedPolicies json %v", failureMessages)
-			if err = sendFailureResponse(p, &pdpUpdate, resMessage); err != nil {
+			if err = sendFailureResponseVar(p, &pdpUpdate, resMessage); err != nil {
 				log.Debugf("Failed to send update error response: %v", err)
 				return err
 			}
@@ -93,7 +102,7 @@ func pdpUpdateMessageHandler(message []byte, p publisher.PdpStatusSender) error
 	// Check if "PoliciesToBeUndeployed" is empty or not
 	if len(pdpUpdate.PoliciesToBeUndeployed) > 0 {
 		log.Infof("Found Policies to be undeployed")
-		failureMessage, successfullyUndeployedPolicies := handlePolicyUndeployment(pdpUpdate, p)
+		failureMessage, successfullyUndeployedPolicies := handlePolicyUndeploymentVar(pdpUpdate, p)
 		mapJson, err := policymap.FormatMapofAnyType(successfullyUndeployedPolicies)
 		if len(failureMessage) > 0 {
 			failureMessages = append(failureMessages, "{UnDeployment Errors:"+strings.Join(failureMessage, "")+"}")
@@ -101,7 +110,7 @@ func pdpUpdateMessageHandler(message []byte, p publisher.PdpStatusSender) error
 		if err != nil {
 			failureMessages = append(failureMessages, "|Internal Map Error:"+err.Error()+"|")
 			resMessage := fmt.Errorf("PDP Update Failed: failed to format successfullyUnDeployedPolicies json %v", failureMessages)
-			if err = sendFailureResponse(p, &pdpUpdate, resMessage); err != nil {
+			if err = sendFailureResponseVar(p, &pdpUpdate, resMessage); err != nil {
 				log.Debugf("Failed to send update error response: %v", err)
 				return err
 			}
@@ -111,7 +120,7 @@ func pdpUpdateMessageHandler(message []byte, p publisher.PdpStatusSender) error
 
 	if len(pdpUpdate.PoliciesToBeDeployed) == 0 && len(pdpUpdate.PoliciesToBeUndeployed) == 0 {
 		//Response for PAP Registration
-		err = sendSuccessResponse(p, &pdpUpdate, "PDP UPDATE is successfull")
+		err = sendSuccessResponseVar(p, &pdpUpdate, "PDP UPDATE is successfull")
 		if err != nil {
 			log.Debugf("Failed to Send Update Response Message: %v\n", err)
 			return err
@@ -149,7 +158,7 @@ func sendFailureResponse(p publisher.PdpStatusSender, pdpUpdate *model.PdpUpdate
 func sendPDPStatusResponse(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender, loggingPoliciesList string, failureMessages []string) error {
 	if len(failureMessages) > 0 {
 		resMessage := fmt.Errorf("PDP Update Failed: %v", failureMessages)
-		if err := sendFailureResponse(p, &pdpUpdate, resMessage); err != nil {
+		if err := sendFailureResponseVar(p, &pdpUpdate, resMessage); err != nil {
 			log.Warnf("Failed to send update error response: %v", err)
 			return err
 		}
@@ -157,7 +166,7 @@ func sendPDPStatusResponse(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSende
 
 		if len(pdpUpdate.PoliciesToBeUndeployed) == 0 {
 			resMessage := fmt.Sprintf("PDP Update Successful for all policies: %v", loggingPoliciesList)
-			if err := sendSuccessResponse(p, &pdpUpdate, resMessage); err != nil {
+			if err := sendSuccessResponseVar(p, &pdpUpdate, resMessage); err != nil {
 				log.Warnf("Failed to send update response: %v", err)
 				return err
 			}
@@ -166,14 +175,14 @@ func sendPDPStatusResponse(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSende
 
 			resMessage := fmt.Sprintf("PDP Update Policies undeployed :%v", loggingPoliciesList)
 
-			if err := sendSuccessResponse(p, &pdpUpdate, resMessage); err != nil {
+			if err := sendSuccessResponseVar(p, &pdpUpdate, resMessage); err != nil {
 				log.Warnf("Failed to Send Update Response Message: %v", err)
 				return err
 			}
 			log.Infof("Processed policies_to_be_undeployed successfully")
 		} else {
 
-			if err := sendSuccessResponse(p, &pdpUpdate, "PDP UPDATE is successfull"); err != nil {
+			if err := sendSuccessResponseVar(p, &pdpUpdate, "PDP UPDATE is successfull"); err != nil {
 				log.Warnf("Failed to Send Update Response Message: %v", err)
 				return err
 			}
diff --git a/pkg/kafkacomm/handler/pdp_update_message_handler_test.go b/pkg/kafkacomm/handler/pdp_update_message_handler_test.go
index d29c814..276cffd 100644
--- a/pkg/kafkacomm/handler/pdp_update_message_handler_test.go
+++ b/pkg/kafkacomm/handler/pdp_update_message_handler_test.go
@@ -22,13 +22,19 @@ import (
 	"errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"policy-opa-pdp/consts"
+	"policy-opa-pdp/pkg/kafkacomm/publisher"
 	"policy-opa-pdp/pkg/kafkacomm/publisher/mocks"
+	"policy-opa-pdp/pkg/model"
 	"policy-opa-pdp/pkg/policymap"
 	"testing"
 )
 
 /*
+var (
+	handlePolicyDeploymentFunc = handlePolicyDeployment
+)*/
+
+/*
 PdpUpdateMessageHandler_success
 Description: Test by sending a valid input message for pdp update
 Input: valid input
@@ -199,9 +205,33 @@ func TestPdpUpdateMessageHandler_Invalid_Starttimeinterval(t *testing.T) {
 
 /*
 PdpUpdateMessageHandler_Successful_Deployment
-Description: Test by sending a valid input with policies to be deployed
-Input: valid input with PoliciesToBeDeployed
-Expected Output: Policies should be deployed successfully and corresponding messages sent.
+*/
+func TestPdpUpdateMessageHandler_Invalid_Deployment(t *testing.T) {
+	messageString := `{
+		"source":"pap-c17b4dbc-3278-483a-ace9-98f3157245c0",
+		"pdpHeartbeatIntervalMs":120000,
+		"messageName":"PDP_UPDATE",
+		"requestId":"41c117db-49a0-40b0-8586-5580d042d0a1",
+		"timestampMs":1730722305297,
+		"name":"opa-21cabb3e-f652-4ca6-b498-a77e62fcd059",
+		"pdpGroup":"opaGroup",
+		"pdpSubgroup":"opa"
+	}`
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+	// Mock the policy deployment logic
+	handlePolicyDeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return nil, map[string]string{"zone": "1.0.0"}
+	}
+
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+	assert.Error(t, err)
+}
+
+/*
+PdpUpdateMessageHandler_Successful_Deployment
 */
 func TestPdpUpdateMessageHandler_Successful_Deployment(t *testing.T) {
 	messageString := `{
@@ -219,18 +249,18 @@ func TestPdpUpdateMessageHandler_Successful_Deployment(t *testing.T) {
 	mockSender := new(mocks.PdpStatusSender)
 	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
 
-	consts.Data ="/tmp/data"
-	consts.Policies ="/tmp/policies"
+	// Mock the policy deployment logic
+	handlePolicyDeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return nil, map[string]string{"zone": "1.0.0"}
+	}
+
 	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
 	assert.NoError(t, err)
 }
 
-
 /*
 PdpUpdateMessageHandler_Skipping_Deployment
-Description: Test by sending a valid input with policies to be deployed where the policy is already deployed
-Input: valid input with PoliciesToBeDeployed
-Expected Output: Policies should be skipping deployment since it is already present.
 */
 func TestPdpUpdateMessageHandler_Skipping_Deployment(t *testing.T) {
 	messageString := `{
@@ -249,6 +279,360 @@ func TestPdpUpdateMessageHandler_Skipping_Deployment(t *testing.T) {
 	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["zone"],"policy": ["zone"],"policy-id": "zone","policy-version": "1.0.0"}]}`
 	mockSender := new(mocks.PdpStatusSender)
 	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
-        err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
 	assert.NoError(t, err)
 }
+
+/*
+PdpUpdateMessageHandler_FailureIn_Deployment_UnDeployment
+*/
+func TestPdpUpdateMessageHandler_FailureIn_Deployment_UnDeployment(t *testing.T) {
+	messageString := `{
+		"source":"pap-c17b4dbc-3278-483a-ace9-98f3157245c0",
+		"pdpHeartbeatIntervalMs":120000,
+		"policiesToBeDeployed": [{"type": "onap.policies.native.opa","type_version": "1.0.0","properties": {"data": {"zone": "ewogICJ6b25lIjogewogICAgInpvbmVfYWNjZXNzX2xvZ3MiOiBbCiAgICAgIHsgImxvZ19pZCI6ICJsb2cxIiwgInRpbWVzdGFtcCI6ICIyMDI0LTExLTAxVDA5OjAwOjAwWiIsICJ6b25lX2lkIjogInpvbmVBIiwgImFjY2VzcyI6ICJncmFudGVkIiwgInVzZXIiOiAidXNlcjEiIH0sCiAgICAgIHsgImxvZ19pZCI6ICJsb2cyIiwgInRpbWVzdGFtcCI6ICIyMDI0LTExLTAxVDEwOjMwOjAwWiIsICJ6b25lX2lkIjogInpvbmVBIiwgImFjY2VzcyI6ICJkZW5pZWQiLCAidXNlciI6ICJ1c2VyMiIgfSwKICAgICAgeyAibG9nX2lkIjogImxvZzMiLCAidGltZXN0YW1wIjogIjIwMjQtMTEtMDFUMTE6MDA6MDBaIiwgInpvbmVfaWQiOiAiem9uZUIiLCAiYWNjZXNzIjogImdyYW50ZWQiLCAidXNlciI6ICJ1c2VyMyIgfQogICAgXQogIH0KfQo="},"policy": {"zone": "cGFja2FnZSB6b25lCgppbXBvcnQgcmVnby52MQoKZGVmYXVsdCBhbGxvdyA6PSBmYWxzZQoKYWxsb3cgaWYgewogICAgaGFzX3pvbmVfYWNjZXNzCiAgICBhY3Rpb25faXNfbG9nX3ZpZXcKfQoKYWN0aW9uX2lzX2xvZ192aWV3IGlmIHsKICAgICJ2aWV3IiBpbiBpbnB1dC5hY3Rpb25zCn0KCmhhc196b25lX2FjY2VzcyBjb250YWlucyBhY2Nlc3NfZGF0YSBpZiB7CiAgICBzb21lIHpvbmVfZGF0YSBpbiBkYXRhLnpvbmUuem9uZS56b25lX2FjY2Vzc19sb2dzCiAgICB6b25lX2RhdGEudGltZXN0YW1wID49IGlucHV0LnRpbWVfcGVyaW9kLmZyb20KICAgIHpvbmVfZGF0YS50aW1lc3RhbXAgPCBpbnB1dC50aW1lX3BlcmlvZC50bwogICAgem9uZV9kYXRhLnpvbmVfaWQgPT0gaW5wdXQuem9uZV9pZAogICAgYWNjZXNzX2RhdGEgOj0ge2RhdGF0eXBlOiB6b25lX2RhdGFbZGF0YXR5cGVdIHwgZGF0YXR5cGUgaW4gaW5wdXQuZGF0YXR5cGVzfQp9Cg=="}},"name": "zone","version": "1.0.0","metadata": {"policy-id": "zone","policy-version": "1.0.0"}}],
+		"policiesToBeUndeployed":[{"name":"role","version":"1.0.0"}],
+		"messageName":"PDP_UPDATE",
+		"requestId":"41c117db-49a0-40b0-8586-5580d042d0a1",
+		"timestampMs":1730722305297,
+		"name":"opa-21cabb3e-f652-4ca6-b498-a77e62fcd059",
+		"pdpGroup":"opaGroup",
+		"pdpSubgroup":"opa"
+	}`
+
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["role"],"policy": ["role"],"policy-id": "role","policy-version": "1.0.0"}]}`
+	// Mock the policy deployment logic
+	handlePolicyDeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return nil, map[string]string{"zone": "1.0.0"}
+	}
+	//mock the policy undeployment
+	handlePolicyUndeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return nil, map[string]string{"role": "1.0.0"}
+	}
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+	assert.NoError(t, err)
+}
+
+/*
+PdpUpdateMessageHandler_Successful_Undeployment
+*/
+func TestPdpUpdateMessageHandler_Successful_Undeployment(t *testing.T) {
+	messageString := `{
+		"source":"pap-c17b4dbc-3278-483a-ace9-98f3157245c0",
+		"pdpHeartbeatIntervalMs":120000,
+		"policiesToBeDeployed":[],
+		"policiesToBeUndeployed":[{"name":"zone","version":"1.0.0"}],
+		"messageName":"PDP_UPDATE",
+		"requestId":"41c117db-49a0-40b0-8586-5580d042d0a1",
+		"timestampMs":1730722305297,
+		"name":"opa-21cabb3e-f652-4ca6-b498-a77e62fcd059",
+		"pdpGroup":"opaGroup",
+		"pdpSubgroup":"opa"
+	}`
+
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["zone"],"policy": ["zone"],"policy-id": "zone","policy-version": "1.0.0"}]}`
+	//mock the policy undeployment
+	handlePolicyUndeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return nil, map[string]string{"zone": "1.0.0"}
+	}
+
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+	assert.NoError(t, err)
+}
+
+/*
+PdpUpdateMessageHandler_Successful_Registration
+*/
+func TestPdpUpdateMessageHandler_Successful_Registration(t *testing.T) {
+	messageString := `{
+		"source":"pap-c17b4dbc-3278-483a-ace9-98f3157245c0",
+		"pdpHeartbeatIntervalMs":120000,
+		"policiesToBeDeployed":[],
+		"policiesToBeUndeployed":[],
+		"messageName":"PDP_UPDATE",
+		"requestId":"41c117db-49a0-40b0-8586-5580d042d0a1",
+		"timestampMs":1730722305297,
+		"name":"opa-21cabb3e-f652-4ca6-b498-a77e62fcd059",
+		"pdpGroup":"opaGroup",
+		"pdpSubgroup":"opa"
+	}`
+
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+	assert.NoError(t, err)
+}
+
+/*
+PdpUpdateMessageHandler_Unsuccessful_Undeployment
+*/
+func TestPdpUpdateMessageHandler_UnSuccessful_Undeployment(t *testing.T) {
+	messageString := `{
+		"source":"pap-c17b4dbc-3278-483a-ace9-98f3157245c0",
+		"pdpHeartbeatIntervalMs":120000,
+		"policiesToBeDeployed":[],
+		"policiesToBeUndeployed":[{"name":"zone","version":"1.0.0"}],
+		"messageName":"PDP_UPDATE",
+		"requestId":"41c117db-49a0-40b0-8586-5580d042d0a1",
+		"timestampMs":1730722305297,
+		"name":"opa-21cabb3e-f652-4ca6-b498-a77e62fcd059",
+		"pdpGroup":"opaGroup",
+		"pdpSubgroup":"opa"
+	}`
+
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": []}`
+	//mock the policy undeployment
+	handlePolicyUndeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return []string{"Error in undeployment"}, map[string]string{}
+	}
+
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("error in undeployment"))
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+	assert.Error(t, err)
+}
+
+/*
+PdpUpdateMessageHandler_Partial_FailureIn_Undeployment
+*/
+func TestPdpUpdateMessageHandler_Partial_FailureIn_Undeployment(t *testing.T) {
+	messageString := `{
+		"source":"pap-c17b4dbc-3278-483a-ace9-98f3157245c0",
+		"pdpHeartbeatIntervalMs":120000,
+		"policiesToBeDeployed":[],
+		"policiesToBeUndeployed":[{"name":"zone","version":"1.0.0"},{"name":"role","version":"1.0.0"}],
+		"messageName":"PDP_UPDATE",
+		"requestId":"41c117db-49a0-40b0-8586-5580d042d0a1",
+		"timestampMs":1730722305297,
+		"name":"opa-21cabb3e-f652-4ca6-b498-a77e62fcd059",
+		"pdpGroup":"opaGroup",
+		"pdpSubgroup":"opa"
+	}`
+
+	policymap.LastDeployedPolicies = `{"deployed_policies_dict": [{"data": ["zone"],"policy": ["zone"],"policy-id": "zone","policy-version": "1.0.0"}]}`
+	//mock the policy undeployment
+	handlePolicyUndeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return []string{"Error in undeployment"}, map[string]string{"zone:": "1.0.0"}
+	}
+
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("error in undeployment"))
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+	assert.Error(t, err)
+}
+
+/*
+PdpUpdateMessageHandler_Unsuccessful_Deployment
+*/
+func TestPdpUpdateMessageHandler_Unsuccessful_Deployment(t *testing.T) {
+	messageString := `{
+		"source":"pap-c17b4dbc-3278-483a-ace9-98f3157245c0",
+		"pdpHeartbeatIntervalMs":120000,
+		"policiesToBeDeployed": [{"type": "onap.policies.native.opa","type_version": "1.0.0","properties": {"data": {"zone": "ewogICJ6b25lIjogewogICAgInpvbmVfYWNjZXNzX2xvZ3MiOiBbCiAgICAgIHsgImxvZ19pZCI6ICJsb2cxIiwgInRpbWVzdGFtcCI6ICIyMDI0LTExLTAxVDA5OjAwOjAwWiIsICJ6b25lX2lkIjogInpvbmVBIiwgImFjY2VzcyI6ICJncmFudGVkIiwgInVzZXIiOiAidXNlcjEiIH0sCiAgICAgIHsgImxvZ19pZCI6ICJsb2cyIiwgInRpbWVzdGFtcCI6ICIyMDI0LTExLTAxVDEwOjMwOjAwWiIsICJ6b25lX2lkIjogInpvbmVBIiwgImFjY2VzcyI6ICJkZW5pZWQiLCAidXNlciI6ICJ1c2VyMiIgfSwKICAgICAgeyAibG9nX2lkIjogImxvZzMiLCAidGltZXN0YW1wIjogIjIwMjQtMTEtMDFUMTE6MDA6MDBaIiwgInpvbmVfaWQiOiAiem9uZUIiLCAiYWNjZXNzIjogImdyYW50ZWQiLCAidXNlciI6ICJ1c2VyMyIgfQogICAgXQogIH0KfQo="},"policy": {"zone": "cGFja2FnZSB6b25lCgppbXBvcnQgcmVnby52MQoKZGVmYXVsdCBhbGxvdyA6PSBmYWxzZQoKYWxsb3cgaWYgewogICAgaGFzX3pvbmVfYWNjZXNzCiAgICBhY3Rpb25faXNfbG9nX3ZpZXcKfQoKYWN0aW9uX2lzX2xvZ192aWV3IGlmIHsKICAgICJ2aWV3IiBpbiBpbnB1dC5hY3Rpb25zCn0KCmhhc196b25lX2FjY2VzcyBjb250YWlucyBhY2Nlc3NfZGF0YSBpZiB7CiAgICBzb21lIHpvbmVfZGF0YSBpbiBkYXRhLnpvbmUuem9uZS56b25lX2FjY2Vzc19sb2dzCiAgICB6b25lX2RhdGEudGltZXN0YW1wID49IGlucHV0LnRpbWVfcGVyaW9kLmZyb20KICAgIHpvbmVfZGF0YS50aW1lc3RhbXAgPCBpbnB1dC50aW1lX3BlcmlvZC50bwogICAgem9uZV9kYXRhLnpvbmVfaWQgPT0gaW5wdXQuem9uZV9pZAogICAgYWNjZXNzX2RhdGEgOj0ge2RhdGF0eXBlOiB6b25lX2RhdGFbZGF0YXR5cGVdIHwgZGF0YXR5cGUgaW4gaW5wdXQuZGF0YXR5cGVzfQp9Cg=="}},"name": "zone","version": "1.0.0","metadata": {"policy-id": "zone","policy-version": "1.0.0"}}],
+		"policiesToBeUndeployed":[],
+		"messageName":"PDP_UPDATE",
+		"requestId":"41c117db-49a0-40b0-8586-5580d042d0a1",
+		"timestampMs":1730722305297,
+		"name":"opa-21cabb3e-f652-4ca6-b498-a77e62fcd059",
+		"pdpGroup":"opaGroup",
+		"pdpSubgroup":"opa"
+	}`
+	mockSender := new(mocks.PdpStatusSender)
+	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+	// Mock the policy deployment logic
+	handlePolicyDeploymentVar = func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string) {
+
+		return []string{"Error in Deployment with Rego Err"}, map[string]string{}
+	}
+
+	err := pdpUpdateMessageHandler([]byte(messageString), mockSender)
+	assert.NoError(t, err)
+}
+
+func TestSendPDPStatusResponse(t *testing.T) {
+	mockSender := new(MockPdpStatusSender)
+	// Test case: Success with policies to be deployed
+	t.Run("Success with Policies to Deploy", func(t *testing.T) {
+		pdpUpdate := model.PdpUpdate{
+			Source:                 "example-source-id",
+			PdpHeartbeatIntervalMs: 120000,
+			MessageType:            "PDP_UPDATE",
+			PoliciesToBeDeployed: []model.ToscaPolicy{
+				{
+					Type:        "onap.policies.native.opa",
+					TypeVersion: "1.0.0",
+				},
+			},
+			PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+			Name:                   "example-name",
+			TimestampMs:            1623412345678,
+			PdpGroup:               "example-group",
+			PdpSubgroup:            "example-subgroup",
+			RequestId:              "test-request-id"}
+		loggingPoliciesList := "policy1"
+		mockSender.On("SendPdpStatus", mock.Anything).Return(nil) // Mock success
+		err := sendPDPStatusResponse(pdpUpdate, mockSender, loggingPoliciesList, []string{})
+		assert.NoError(t, err) // Expect no error
+
+	})
+	// Test case: Success with policies to undeploy
+	t.Run("Success with Policies to Undeploy", func(t *testing.T) {
+		pdpUpdate := model.PdpUpdate{
+			Source:                 "example-source-id",
+			PdpHeartbeatIntervalMs: 120000,
+			MessageType:            "PDP_UPDATE",
+			PoliciesToBeDeployed:   []model.ToscaPolicy{},
+			PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{
+				{
+					Name: "policy-to-undeply",
+				},
+			},
+			Name:        "example-name",
+			TimestampMs: 1623412345678,
+			PdpGroup:    "example-group",
+			PdpSubgroup: "example-subgroup",
+			RequestId:   "test-request-id",
+		}
+		loggingPoliciesList := "policy2"
+		mockSender.On("SendPdpStatus", mock.Anything).Return(nil) // Mock success
+		err := sendPDPStatusResponse(pdpUpdate, mockSender, loggingPoliciesList, []string{})
+		assert.NoError(t, err) // Expect no error
+	})
+	// Test case: Fail with policies to undeploy
+	t.Run("Success with Policies to Undeploy", func(t *testing.T) {
+		pdpUpdate := model.PdpUpdate{
+			Source:                 "example-source-id",
+			PdpHeartbeatIntervalMs: 120000,
+			MessageType:            "PDP_UPDATE",
+			PoliciesToBeDeployed:   []model.ToscaPolicy{},
+			PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{
+				{
+					Name: "policy-to-undeply",
+				},
+			},
+			Name:        "example-name",
+			TimestampMs: 1623412345678,
+			PdpGroup:    "example-group",
+			PdpSubgroup: "example-subgroup",
+			RequestId:   "test-request-id",
+		}
+		loggingPoliciesList := "policy2"
+		mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("Error in sending response")) // Mock failure
+		// Patching sendFailureResponse to simulate a failure
+		sendSuccessResponseVar = func(p publisher.PdpStatusSender, pdpUpdate *model.PdpUpdate, respMessage string) error {
+			return errors.New("error sending success response")
+		}
+		err := sendPDPStatusResponse(pdpUpdate, mockSender, loggingPoliciesList, []string{})
+		assert.Error(t, err) // Expect an error since we're simulating failure in sendSuccessResponse
+	})
+	// Test case: Responses accordingly when both deploy and undeploy
+	t.Run("Success with Both Policies", func(t *testing.T) {
+		pdpUpdate := model.PdpUpdate{
+			Source:                 "example-source-id",
+			PdpHeartbeatIntervalMs: 120000,
+			MessageType:            "PDP_UPDATE",
+			PoliciesToBeDeployed: []model.ToscaPolicy{
+				{
+					Type:        "onap.policies.native.opa",
+					TypeVersion: "1.0.0",
+				},
+			},
+			PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{
+				{
+					Name: "policy-to-undeply",
+				},
+			},
+			Name:        "example-name",
+			TimestampMs: 1623412345678,
+			PdpGroup:    "example-group",
+			PdpSubgroup: "example-subgroup",
+			RequestId:   "test-request-id",
+		}
+		loggingPoliciesList := "policy3, policy4"
+		mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("error in response")) // Mock success
+		err := sendPDPStatusResponse(pdpUpdate, mockSender, loggingPoliciesList, []string{})
+		assert.Error(t, err) // Expect no error
+	})
+	// Test case: Failure scenario
+	t.Run("Failure scenario with Error Message", func(t *testing.T) {
+		pdpUpdate := model.PdpUpdate{
+			Source:                 "example-source-id",
+			PdpHeartbeatIntervalMs: 120000,
+			MessageType:            "PDP_UPDATE",
+			PoliciesToBeDeployed: []model.ToscaPolicy{
+				{
+					Type:        "onap.policies.native.opa",
+					TypeVersion: "1.0.0",
+				},
+			},
+			PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{
+				{
+					Name: "policy-to-undeply",
+				},
+			},
+			Name:        "example-name",
+			TimestampMs: 1623412345678,
+			PdpGroup:    "example-group",
+			PdpSubgroup: "example-subgroup",
+			RequestId:   "test-request-id",
+		}
+		mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("sending failed")) // Simulate an error
+		err := sendPDPStatusResponse(pdpUpdate, mockSender, "Some logging", []string{"Error here"})
+		assert.NoError(t, err) // Expect error due to failure response
+	})
+}
+
+// TestSendPDPStatusResponse function
+func TestSendPDPStatusResponse_SimulateFailures(t *testing.T) {
+	mockSender := new(MockPdpStatusSender)
+
+	// Test case: Failure scenario
+	pdpUpdate := model.PdpUpdate{
+		Source:                 "example-source-id",
+		PdpHeartbeatIntervalMs: 120000,
+		MessageType:            "PDP_UPDATE",
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{
+				Type:        "onap.policies.native.opa",
+				TypeVersion: "1.0.0",
+			},
+		},
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{},
+		Name:                   "example-name",
+		TimestampMs:            1623412345678,
+		PdpGroup:               "example-group",
+		PdpSubgroup:            "example-subgroup",
+		RequestId:              "test-request-id",
+	}
+	// Patching sendSuccessResponse to simulate a failure
+	sendSuccessResponseVar = func(p publisher.PdpStatusSender, pdpUpdate *model.PdpUpdate, respMessage string) error {
+		return errors.New("error sending success response")
+	}
+	loggingPoliciesList := "policy1"
+	mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("error")) // Mock success
+	err := sendPDPStatusResponse(pdpUpdate, mockSender, loggingPoliciesList, []string{})
+	assert.Error(t, err) // Expect an error since we're simulating failure in sendSuccessResponse
+
+	// Patching sendFailureResponse to simulate a failure
+	sendFailureResponseVar = func(p publisher.PdpStatusSender, pdpUpdate *model.PdpUpdate, respMessage error) error {
+		return errors.New("error sending failure response")
+	}
+	err = sendPDPStatusResponse(pdpUpdate, mockSender, loggingPoliciesList, []string{"Error in Failure Response"})
+	assert.Error(t, err) // Expect an error since we're simulating failure in sendSuccessResponse
+
+}
+
+func TestCreateBundleFunc(t *testing.T){
+}
diff --git a/pkg/kafkacomm/handler/pdp_update_undeploy_policy.go b/pkg/kafkacomm/handler/pdp_update_undeploy_policy.go
index 9770d88..31d4554 100644
--- a/pkg/kafkacomm/handler/pdp_update_undeploy_policy.go
+++ b/pkg/kafkacomm/handler/pdp_update_undeploy_policy.go
@@ -34,6 +34,32 @@ import (
 	"strings"
 )
 
+type (
+	HandlePolicyUndeploymentFunc func(pdpUpdate model.PdpUpdate, p publisher.PdpStatusSender) ([]string, map[string]string)
+)
+
+var (
+        handlePolicyUndeploymentVar HandlePolicyUndeploymentFunc = handlePolicyUndeployment
+
+        removeDirectoryFunc          = utils.RemoveDirectory
+
+        deleteDataSdkFunc            = opasdk.DeleteData
+
+        deletePolicySdkFunc          = opasdk.DeletePolicy
+
+        removeDataDirectoryFunc      = removeDataDirectory
+
+        removePolicyDirectoryFunc    = removePolicyDirectory
+
+	policyUndeploymentActionFunc = policyUndeploymentAction
+
+	removePolicyFromSdkandDirFunc= removePolicyFromSdkandDir
+
+	removeDataFromSdkandDirFunc  = removeDataFromSdkandDir
+
+)
+
+
 // processPoliciesTobeUndeployed handles the undeployment of policies
 func processPoliciesTobeUndeployed(undeployedPolicies map[string]string) ([]string, map[string]string) {
 	var failureMessages []string
@@ -51,7 +77,7 @@ func processPoliciesTobeUndeployed(undeployedPolicies map[string]string) ([]stri
 		matchedPolicy := findDeployedPolicy(policyID, policyVersion, deployedPolicies)
 		if matchedPolicy != nil {
 			// Handle undeployment for the policy
-			errs := policyUndeploymentAction(matchedPolicy)
+			errs := policyUndeploymentActionFunc(matchedPolicy)
 			if len(errs) > 0 {
 				metrics.IncrementUndeployFailureCount()
 				metrics.IncrementTotalErrorCount()
@@ -72,8 +98,8 @@ func processPoliciesTobeUndeployed(undeployedPolicies map[string]string) ([]stri
 		}
 	}
 
-        totalPolicies := policymap.GetTotalDeployedPoliciesCountFromMap()
-        metrics.SetTotalPoliciesCount(int64(totalPolicies))
+	totalPolicies := policymap.GetTotalDeployedPoliciesCountFromMap()
+	metrics.SetTotalPoliciesCount(int64(totalPolicies))
 
 	return failureMessages, successfullyUndeployedPolicies
 }
@@ -105,11 +131,11 @@ func policyUndeploymentAction(policy map[string]interface{}) []string {
 	var failureMessages []string
 
 	// Delete "policy" sdk and directories
-	policyErrors := removePolicyFromSdkandDir(policy)
+	policyErrors := removePolicyFromSdkandDirFunc(policy)
 	failureMessages = append(failureMessages, policyErrors...)
 
 	// Delete "data" sdk and directories
-	dataErrors := removeDataFromSdkandDir(policy)
+	dataErrors := removeDataFromSdkandDirFunc(policy)
 	failureMessages = append(failureMessages, dataErrors...)
 
 	return failureMessages
@@ -123,11 +149,11 @@ func removeDataFromSdkandDir(policy map[string]interface{}) []string {
 		for _, dataKey := range dataKeys {
 			keyPath := "/" + strings.Replace(dataKey.(string), ".", "/", -1)
 			log.Debugf("Deleting data from OPA at keypath: %s", keyPath)
-			if err := opasdk.DeleteData(context.Background(), keyPath); err != nil {
+			if err := deleteDataSdkFunc(context.Background(), keyPath); err != nil {
 				failureMessages = append(failureMessages, err.Error())
 				continue
 			}
-			if err := removeDataDirectory(keyPath); err != nil {
+			if err := removeDataDirectoryFunc(keyPath); err != nil {
 				failureMessages = append(failureMessages, err.Error())
 			}
 		}
@@ -145,11 +171,11 @@ func removePolicyFromSdkandDir(policy map[string]interface{}) []string {
 	if policyKeys, ok := policy["policy"].([]interface{}); ok {
 		for _, policyKey := range policyKeys {
 			keyPath := "/" + strings.Replace(policyKey.(string), ".", "/", -1)
-			if err := opasdk.DeletePolicy(context.Background(), policyKey.(string)); err != nil {
+			if err := deletePolicySdkFunc(context.Background(), policyKey.(string)); err != nil {
 				failureMessages = append(failureMessages, err.Error())
 				continue
 			}
-			if err := removePolicyDirectory(keyPath); err != nil {
+			if err := removePolicyDirectoryFunc(keyPath); err != nil {
 				failureMessages = append(failureMessages, err.Error())
 			}
 		}
@@ -164,7 +190,7 @@ func removePolicyFromSdkandDir(policy map[string]interface{}) []string {
 func removeDataDirectory(dataKey string) error {
 	dataPath := filepath.Join(consts.Data, dataKey)
 	log.Debugf("Removing data directory: %s", dataPath)
-	if err := utils.RemoveDirectory(dataPath); err != nil {
+	if err := removeDirectoryFunc(dataPath); err != nil {
 		return fmt.Errorf("Failed to handle directory for data %s: %v", dataPath, err)
 	}
 	return nil
@@ -174,7 +200,7 @@ func removeDataDirectory(dataKey string) error {
 func removePolicyDirectory(policyKey string) error {
 	policyPath := filepath.Join(consts.Policies, policyKey)
 	log.Debugf("Removing policy directory: %s", policyPath)
-	if err := utils.RemoveDirectory(policyPath); err != nil {
+	if err := removeDirectoryFunc(policyPath); err != nil {
 		return fmt.Errorf("Failed to handle directory for policy %s: %v", policyPath, err)
 	}
 	return nil
diff --git a/pkg/kafkacomm/handler/pdp_update_undeploy_policy_test.go b/pkg/kafkacomm/handler/pdp_update_undeploy_policy_test.go
new file mode 100644
index 0000000..f725f4b
--- /dev/null
+++ b/pkg/kafkacomm/handler/pdp_update_undeploy_policy_test.go
@@ -0,0 +1,486 @@
+// -
+//   ========================LICENSE_START=================================
+//   Copyright (C) 2025: Deutsche Telekom
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//   SPDX-License-Identifier: Apache-2.0
+//   ========================LICENSE_END===================================
+
+// will process the update message from pap and send the pdp status response.
+package handler
+
+import (
+	// "encoding/json"
+	"context"
+	"errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"policy-opa-pdp/consts"
+	"policy-opa-pdp/pkg/model"
+	"policy-opa-pdp/pkg/policymap"
+	"testing"
+)
+
+// Success case: Extract undeployed policies
+func TestExtractUndeployedPolicies_Success(t *testing.T) {
+	policies := []model.ToscaConceptIdentifier{
+		{Name: "test-policy", Version: "v1"},
+		{Name: "test-policy-2", Version: "v2"},
+	}
+
+	result := extractUndeployedPolicies(policies)
+
+	assert.Equal(t, "v1", result["test-policy"], "Expected version v1 for test-policy")
+	assert.Equal(t, "v2", result["test-policy-2"], "Expected version v2 for test-policy-2")
+}
+
+// Failure case: Empty policy list
+func TestExtractUndeployedPolicies_Failure_EmptyList(t *testing.T) {
+	policies := []model.ToscaConceptIdentifier{}
+	result := extractUndeployedPolicies(policies)
+
+	assert.Empty(t, result, "Expected an empty map")
+}
+
+// Success case: Policy found
+func TestFindDeployedPolicy_Success(t *testing.T) {
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "test-policy", "policy-version": "v1"},
+		{"policy-id": "other-policy", "policy-version": "v2"},
+	}
+
+	result := findDeployedPolicy("test-policy", "v1", deployedPolicies)
+
+	assert.NotNil(t, result, "Expected to find the policy")
+	assert.Equal(t, "test-policy", result["policy-id"])
+}
+
+// Failure case: Policy not found
+func TestFindDeployedPolicy_Failure_NotFound(t *testing.T) {
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "other-policy", "policy-version": "v2"},
+	}
+
+	result := findDeployedPolicy("test-policy", "v1", deployedPolicies)
+
+	assert.Nil(t, result, "Expected to not find the policy")
+}
+
+// Success case: Handle policy undeployment
+func TestHandlePolicyUndeployment_Success(t *testing.T) {
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{
+			{Name: "test-policy", Version: "v1"},
+		},
+	}
+
+	mockPublisher := new(MockPdpStatusSender)
+	errorMessages, successPolicies := handlePolicyUndeployment(pdpUpdate, mockPublisher)
+
+	assert.Empty(t, errorMessages, "Expected no failures")
+	assert.Equal(t, 0, len(successPolicies), "Expected one successfully undeployed policy")
+	assert.Equal(t, "", successPolicies["test-policy"])
+}
+
+// Failure case: Empty policies to be undeployed
+func TestHandlePolicyUndeployment_Failure_EmptyPolicies(t *testing.T) {
+	pdpUpdate := model.PdpUpdate{PoliciesToBeUndeployed: []model.ToscaConceptIdentifier{}}
+	mockPublisher := new(MockPdpStatusSender)
+
+	errorMessages, successPolicies := handlePolicyUndeployment(pdpUpdate, mockPublisher)
+
+	assert.Empty(t, successPolicies, "Expected no successfully undeployed policies")
+	assert.Empty(t, errorMessages, "Expected no error messages")
+}
+
+// Mock dependencies
+type MockPolicyMap struct {
+	mock.Mock
+}
+
+func (m *MockPolicyMap) UnmarshalLastDeployedPolicies(data string) ([]map[string]interface{}, error) {
+	args := m.Called(data)
+	result, _ := args.Get(0).([]map[string]interface{})
+	return result, args.Error(1)
+}
+
+func (m *MockPolicyMap) RemoveUndeployedPoliciesfromMap(policy map[string]interface{}) (string, error) {
+	args := m.Called(policy)
+	return args.String(0), args.Error(1)
+}
+
+// Success case: Policy undeployment successful
+func TestProcessPoliciesTobeUndeployed_Success(t *testing.T) {
+	undeployedPolicies := map[string]string{"test-policy": "v1"}
+
+	// Mock deployed policies
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "test-policy", "policy-version": "v1", "data": []interface{}{"key1"}, "policy": []interface{}{"rule1"}},
+	}
+
+	mockPolicyMap := new(MockPolicyMap)
+	mockPolicyMap.On("UnmarshalLastDeployedPolicies", mock.Anything).Return(deployedPolicies, nil)
+	mockPolicyMap.On("RemoveUndeployedPoliciesfromMap", mock.Anything).Return("{}", nil)
+
+	policymap.LastDeployedPolicies = `{"test-policy": "v1"}`
+
+	failures, success := processPoliciesTobeUndeployed(undeployedPolicies)
+
+	assert.Empty(t, failures, "Expected no failures")
+	assert.Equal(t, 0, len(success), "Expected one policy to be successfully undeployed")
+	assert.Equal(t, "", success["test-policy"])
+}
+
+// Failure case: Policy undeployment fails due to missing policy
+func TestProcessPoliciesTobeUndeployed_Failure_NoMatch(t *testing.T) {
+	undeployedPolicies := map[string]string{"non-existent-policy": "v1"}
+
+	// Mock deployed policies (empty list)
+	deployedPolicies := []map[string]interface{}{}
+
+	mockPolicyMap := new(MockPolicyMap)
+	mockPolicyMap.On("UnmarshalLastDeployedPolicies", mock.Anything).Return(deployedPolicies, nil)
+
+	policymap.LastDeployedPolicies = `{"test-policy": "v1"}`
+
+	failures, success := processPoliciesTobeUndeployed(undeployedPolicies)
+
+	assert.Empty(t, success, "Expected no policies to be successfully undeployed")
+	assert.Empty(t, failures, "Expected no failure messages")
+}
+
+func TestProcessPoliciesTobeUndeployed_Failure_UnmarshalError(t *testing.T) {
+	undeployedPolicies := map[string]string{"test-policy": "v1"}
+
+	mockPolicyMap := new(MockPolicyMap)
+	mockPolicyMap.On("UnmarshalLastDeployedPolicies", mock.Anything).Return([]map[string]interface{}{}, errors.New("unmarshal error"))
+
+	policymap.LastDeployedPolicies = `invalid json`
+
+	failures, success := processPoliciesTobeUndeployed(undeployedPolicies)
+
+	assert.Empty(t, success, "Expected no successful undeployments")
+	assert.Empty(t, failures, "Expected failure messages due to unmarshal error")
+}
+
+func TestProcessPoliciesTobeUndeployed_Failure_PolicyNotFound(t *testing.T) {
+	undeployedPolicies := map[string]string{"non-existent-policy": "v1"}
+	mockPolicyMap := new(MockPolicyMap)
+	mockPolicyMap.On("UnmarshalLastDeployedPolicies", mock.Anything).Return([]map[string]interface{}{}, nil)
+
+	failures, success := processPoliciesTobeUndeployed(undeployedPolicies)
+
+	assert.Empty(t, success, "Expected no successful undeployments since policy doesn't exist")
+	assert.Empty(t, failures, "Failures list should be empty since policy wasn't found")
+}
+
+func TestProcessPoliciesTobeUndeployed_FailureInUndeployment(t *testing.T) {
+	// Backup original function
+	originalFunc := policyUndeploymentActionFunc
+	defer func() { policyUndeploymentActionFunc = originalFunc }()
+
+	// Mock policy undeployment action to fail
+	policyUndeploymentActionFunc = func(policy map[string]interface{}) []string {
+		return []string{"Failed to undeploy"}
+	}
+
+	mockPolicyMap := new(MockPolicyMap)
+	undeployedPolicies := map[string]string{
+		"policy2": "v1",
+	}
+
+	mockPolicy := map[string]interface{}{
+		"policyID":      "policy2",
+		"policyVersion": "v1",
+	}
+
+	mockPolicyMap.On("UnmarshalLastDeployedPolicies", mock.Anything).Return([]map[string]interface{}{mockPolicy}, nil)
+	mockPolicyMap.On("RemoveUndeployedPoliciesfromMap", mockPolicy).Return("{}", nil)
+
+	// Run function
+	failureMessages, successPolicies := processPoliciesTobeUndeployed(undeployedPolicies)
+
+	// Assertions
+	assert.Empty(t, failureMessages)
+	assert.Empty(t, successPolicies)
+}
+
+func TestProcessPoliciesTobeUndeployed_PolicyNotDeployed(t *testing.T) {
+	// Backup original function
+	originalFunc := policyUndeploymentActionFunc
+	defer func() { policyUndeploymentActionFunc = originalFunc }()
+
+	// Mock policy undeployment action to succeed
+	policyUndeploymentActionFunc = func(policy map[string]interface{}) []string {
+		return nil
+	}
+
+	mockPolicyMap := new(MockPolicyMap)
+	undeployedPolicies := map[string]string{
+		"policy3": "v1",
+	}
+
+	mockPolicyMap.On("UnmarshalLastDeployedPolicies", mock.Anything).Return([]map[string]interface{}{}, nil)
+
+	// Run function
+	failureMessages, successPolicies := processPoliciesTobeUndeployed(undeployedPolicies)
+
+	// Assertions
+	assert.Empty(t, failureMessages)
+	assert.Empty(t, successPolicies)
+}
+
+func TestProcessPoliciesTobeUndeployed_ErrorInRemoveFromMap(t *testing.T) {
+	// Backup original function
+	originalFunc := policyUndeploymentActionFunc
+	defer func() { policyUndeploymentActionFunc = originalFunc }()
+
+	// Mock policy undeployment action to succeed
+	policyUndeploymentActionFunc = func(policy map[string]interface{}) []string {
+		return nil
+	}
+
+	mockPolicyMap := new(MockPolicyMap)
+	undeployedPolicies := map[string]string{
+		"policy4": "v1",
+	}
+
+	mockPolicy := map[string]interface{}{
+		"policyID":      "policy4",
+		"policyVersion": "v1",
+	}
+
+	mockPolicyMap.On("UnmarshalLastDeployedPolicies", mock.Anything).Return([]map[string]interface{}{mockPolicy}, nil)
+	mockPolicyMap.On("RemoveUndeployedPoliciesfromMap", mockPolicy).Return("", errors.New("removal error"))
+
+	// Run function
+	failureMessages, successPolicies := processPoliciesTobeUndeployed(undeployedPolicies)
+
+	// Assertions
+	assert.Empty(t, failureMessages)
+	assert.Empty(t, successPolicies)
+}
+
+func TestRemoveDataDirectory(t *testing.T) {
+	// Backup original values
+	originalDataPath := consts.Data
+	originalFunc := removeDirectoryFunc
+
+	// Restore values after test
+	defer func() {
+		consts.Data = originalDataPath
+		removeDirectoryFunc = originalFunc
+	}()
+
+	// Mock the base path for testing
+	consts.Data = "/mock/data"
+
+	// Mock success case
+	removeDirectoryFunc = func(path string) error {
+		return nil
+	}
+
+	err := removeDataDirectory("testkey")
+	assert.Nil(t, err)
+
+	// Mock failure case
+	removeDirectoryFunc = func(path string) error {
+		return errors.New("mocked error")
+	}
+
+	err = removeDataDirectory("testkey")
+	expectedError := "Failed to handle directory for data /mock/data/testkey: mocked error"
+	assert.Equal(t, expectedError, err.Error())
+}
+
+func TestRemovePolicyDirectory(t *testing.T) {
+	// Backup original values
+	originalPolicyPath := consts.Policies
+	originalFunc := removeDirectoryFunc
+
+	// Restore values after test
+	defer func() {
+		consts.Policies = originalPolicyPath
+		removeDirectoryFunc = originalFunc
+	}()
+
+	// Mock the base path for testing
+	consts.Policies = "/mock/policies"
+
+	// Mock success case
+	removeDirectoryFunc = func(path string) error {
+		return nil
+	}
+
+	err := removePolicyDirectory("testpolicy")
+	assert.Nil(t, err)
+
+	// Mock failure case
+	removeDirectoryFunc = func(path string) error {
+		return errors.New("mocked error")
+	}
+
+	err = removePolicyDirectory("testpolicy")
+	expectedError := "Failed to handle directory for policy /mock/policies/testpolicy: mocked error"
+	assert.Equal(t, expectedError, err.Error())
+}
+
+// Test function for removeDataFromSdkandDir
+func TestRemoveDataFromSdkandDir(t *testing.T) {
+	// Backup original functions
+	originalRemoveDataDirectory := removeDataDirectoryFunc
+	originalDeleteData := deleteDataSdkFunc
+	defer func() {
+		removeDataDirectoryFunc = originalRemoveDataDirectory // Restore after test
+		deleteDataSdkFunc = originalDeleteData                // Restore after test
+	}()
+
+	// Mock removeDataDirectoryFunc and deleteDataFunc to return errors for testing
+	removeDataDirectoryFunc = func(dataKey string) error {
+		if dataKey == "/mocked/error" {
+			return errors.New("mocked remove data directory error")
+		}
+		return nil
+	}
+
+	deleteDataSdkFunc = func(ctx context.Context, keyPath string) error {
+		if keyPath == "/mocked/error" {
+			return errors.New("mocked delete data error")
+		}
+		return nil
+	}
+
+	policy := map[string]interface{}{
+		"data": []interface{}{"mocked.success", "mocked.error"},
+	}
+
+	failures := removeDataFromSdkandDir(policy)
+
+	assert.Len(t, failures, 1) // We expect two errors
+	assert.Contains(t, failures[0], "mocked delete data error")
+}
+
+
+func TestRemovePolicyFromSdkandDir(t *testing.T) {
+    // Backup original functions
+    originalRemovePolicyDirectory := removePolicyDirectoryFunc
+    originalDeletePolicy := deletePolicySdkFunc
+    defer func() {
+        removePolicyDirectoryFunc = originalRemovePolicyDirectory // Restore after test
+        deletePolicySdkFunc = originalDeletePolicy // Restore after test
+    }()
+
+    // Mock functions
+    removePolicyDirectoryFunc = func(policyKey string) error {
+        if policyKey == "/mocked/error" {
+            return errors.New("mocked remove policy directory error")
+        }
+        return nil
+    }
+
+    deletePolicySdkFunc = func(ctx context.Context, policyPath string) error {
+        if policyPath == "mocked.error" {
+            return errors.New("mocked delete policy error")
+        }
+        return nil
+    }
+
+    policy := map[string]interface{}{
+        "policy": []interface{}{"mocked.success", "mocked.error"}, // VALID policy key
+    }
+
+    failures := removePolicyFromSdkandDir(policy)
+
+    // Expecting 1 error message (for "mocked.error"), "mocked.success" should pass
+    assert.Len(t, failures, 1)
+    assert.Contains(t, failures[0], "mocked delete policy error")
+}
+
+
+// Mocking the remove functions
+var (
+	mockRemovePolicyFromSdkandDir = func(policy map[string]interface{}) []string {
+		return nil // Default successful case
+	}
+	mockRemoveDataFromSdkandDir = func(policy map[string]interface{}) []string {
+		return nil // Default successful case
+	}
+)
+
+// Replace the actual functions with mocks in the test
+func TestPolicyUndeploymentAction(t *testing.T) {
+	// Backup original function pointers
+	originalRemovePolicy := removePolicyFromSdkandDirFunc
+	originalRemoveData := removeDataFromSdkandDirFunc
+
+	// Restore original functions after test
+	defer func() {
+		removePolicyFromSdkandDirFunc = originalRemovePolicy
+		removeDataFromSdkandDirFunc = originalRemoveData
+	}()
+
+	tests := []struct {
+		name             string
+		policy           map[string]interface{}
+		mockPolicyErrors []string
+		mockDataErrors   []string
+		expectedFailures []string
+	}{
+		{
+			name:             "Successful undeployment",
+			policy:           map[string]interface{}{"policy_id": "test-policy"},
+			mockPolicyErrors: nil,
+			mockDataErrors:   nil,
+			expectedFailures: nil,
+		},
+		{
+			name:             "Policy removal failure",
+			policy:           map[string]interface{}{"policy_id": "test-policy"},
+			mockPolicyErrors: []string{"Failed to remove policy"},
+			mockDataErrors:   nil,
+			expectedFailures: []string{"Failed to remove policy"},
+		},
+		{
+			name:             "Data removal failure",
+			policy:           map[string]interface{}{"policy_id": "test-policy"},
+			mockPolicyErrors: nil,
+			mockDataErrors:   []string{"Failed to remove data"},
+			expectedFailures: []string{"Failed to remove data"},
+		},
+		{
+			name:             "Both removals fail",
+			policy:           map[string]interface{}{"policy_id": "test-policy"},
+			mockPolicyErrors: []string{"Failed to remove policy"},
+			mockDataErrors:   []string{"Failed to remove data"},
+			expectedFailures: []string{"Failed to remove policy", "Failed to remove data"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Set mock behavior
+			removePolicyFromSdkandDirFunc = func(policy map[string]interface{}) []string {
+				return tt.mockPolicyErrors
+			}
+			removeDataFromSdkandDirFunc = func(policy map[string]interface{}) []string {
+				return tt.mockDataErrors
+			}
+
+			// Call the function under test
+			failureMessages := policyUndeploymentAction(tt.policy)
+
+			// Validate output
+			assert.Equal(t, tt.expectedFailures, failureMessages)
+		})
+	}
+}
diff --git a/pkg/kafkacomm/mocks/kafkaproducerinterface.go b/pkg/kafkacomm/mocks/kafkaproducerinterface.go
index 900135a..b855619 100644
--- a/pkg/kafkacomm/mocks/kafkaproducerinterface.go
+++ b/pkg/kafkacomm/mocks/kafkaproducerinterface.go
@@ -18,6 +18,24 @@ func (_m *KafkaProducerInterface) Close() {
 	_m.Called()
 }
 
+// Flush provides a mock function with given fields: timeout
+func (_m *KafkaProducerInterface) Flush(timeout int) int {
+	ret := _m.Called(timeout)
+
+	if len(ret) == 0 {
+		panic("no return value specified for Flush")
+	}
+
+	var r0 int
+	if rf, ok := ret.Get(0).(func(int) int); ok {
+		r0 = rf(timeout)
+	} else {
+		r0 = ret.Get(0).(int)
+	}
+
+	return r0
+}
+
 // Produce provides a mock function with given fields: _a0, _a1
 func (_m *KafkaProducerInterface) Produce(_a0 *kafka.Message, _a1 chan kafka.Event) error {
 	ret := _m.Called(_a0, _a1)
diff --git a/pkg/kafkacomm/pdp_topic_consumer.go b/pkg/kafkacomm/pdp_topic_consumer.go
index f30e818..2b28672 100644
--- a/pkg/kafkacomm/pdp_topic_consumer.go
+++ b/pkg/kafkacomm/pdp_topic_consumer.go
@@ -48,10 +48,13 @@ type KafkaConsumer struct {
 }
 
 // Close closes the KafkaConsumer
-func (kc *KafkaConsumer) Close() {
+func (kc *KafkaConsumer) Close() error{
 	if kc.Consumer != nil {
-		kc.Consumer.Close()
+		if err := kc.Consumer.Close(); err != nil{
+			return fmt.Errorf("failed to close consumer: %v", err)
+		}
 	}
+	return nil
 }
 
 // Unsubscribe unsubscribes the KafkaConsumer
@@ -68,7 +71,10 @@ func (kc *KafkaConsumer) Unsubscribe() error {
 	return nil
 }
 
-// NewKafkaConsumer creates a new Kafka consumer and returns it
+type KafkaNewConsumerFunc func(*kafka.ConfigMap) (*kafka.Consumer, error)
+var KafkaNewConsumer KafkaNewConsumerFunc = kafka.NewConsumer
+
+// NewKafkaConsumer creates a new Kafka consumer and returns 
 func NewKafkaConsumer() (*KafkaConsumer, error) {
 	// Initialize the consumer instance only once
 	consumerOnce.Do(func() {
@@ -86,25 +92,25 @@ func NewKafkaConsumer() (*KafkaConsumer, error) {
 			"group.id":          groupid,
 			"auto.offset.reset": "latest",
 		}
-
+		fmt.Print(configMap)
 		// If SASL is enabled, add SASL properties
 		if useSASL == "true" {
-			configMap.SetKey("sasl.mechanism", "SCRAM-SHA-512")
-			configMap.SetKey("sasl.username", username)
-			configMap.SetKey("sasl.password", password)
-			configMap.SetKey("security.protocol", "SASL_PLAINTEXT")
-			configMap.SetKey("fetch.max.bytes", 50*1024*1024)
-			configMap.SetKey("max.partition.fetch.bytes",50*1024*1024)
-                        configMap.SetKey("socket.receive.buffer.bytes", 50*1024*1024)
-			configMap.SetKey("session.timeout.ms", "30000")
-			configMap.SetKey("max.poll.interval.ms", "300000")
-			configMap.SetKey("enable.partition.eof", true)
-			configMap.SetKey("enable.auto.commit", true)
+			configMap.SetKey("sasl.mechanism", "SCRAM-SHA-512") // #nosec G104
+			configMap.SetKey("sasl.username", username) // #nosec G104
+			configMap.SetKey("sasl.password", password) // #nosec G104
+			configMap.SetKey("security.protocol", "SASL_PLAINTEXT") // #nosec G104
+			configMap.SetKey("fetch.max.bytes", 50*1024*1024) // #nosec G104
+			configMap.SetKey("max.partition.fetch.bytes",50*1024*1024) // #nosec G104
+                        configMap.SetKey("socket.receive.buffer.bytes", 50*1024*1024) // #nosec G104
+			configMap.SetKey("session.timeout.ms", "30000") // #nosec G104
+			configMap.SetKey("max.poll.interval.ms", "300000") // #nosec G104
+			configMap.SetKey("enable.partition.eof", true) // #nosec G104
+			configMap.SetKey("enable.auto.commit", true) // #nosec G104
 			// configMap.SetKey("debug", "all") // Uncomment for debug
 		}
 
 		// Create a new Kafka consumer
-		consumer, err := kafka.NewConsumer(configMap)
+		consumer, err := KafkaNewConsumer(configMap)
 		if err != nil {
 			log.Warnf("Error creating consumer: %v", err)
 			return
diff --git a/pkg/kafkacomm/pdp_topic_consumer_test.go b/pkg/kafkacomm/pdp_topic_consumer_test.go
index 3d7bb1d..f9160b2 100644
--- a/pkg/kafkacomm/pdp_topic_consumer_test.go
+++ b/pkg/kafkacomm/pdp_topic_consumer_test.go
@@ -20,7 +20,6 @@
 package kafkacomm
 
 import (
-	"bou.ke/monkey"
 	"errors"
         "fmt"
 	"github.com/confluentinc/confluent-kafka-go/v2/kafka"
@@ -133,6 +132,21 @@ func TestKafkaConsumer_Close(t *testing.T) {
 	mockConsumer.AssertExpectations(t)
 }
 
+func TestKafkaConsumerClose_Error(t *testing.T) {
+        mockConsumer := new(mocks.KafkaConsumerInterface)
+
+        kc := &KafkaConsumer{Consumer: mockConsumer}
+
+        // Set up the mock for Close
+        mockConsumer.On("Close").Return(errors.New("close error"))
+
+        // Test Close method
+        kc.Close()
+
+        // Verify that Close was called
+        mockConsumer.AssertExpectations(t)
+}
+
 func TestKafkaConsumer_Unsubscribe(t *testing.T) {
 	mockConsumer := new(mocks.KafkaConsumerInterface)
 
@@ -184,25 +198,27 @@ func resetKafkaConsumerSingleton() {
 // Test for mock error creating consumers
 func TestNewKafkaConsumer_ErrorCreatingConsumer(t *testing.T) {
 	resetKafkaConsumerSingleton()
-	monkey.Patch(kafka.NewConsumer, func(config *kafka.ConfigMap) (*kafka.Consumer, error) {
+	originalNewKafkaConsumer := KafkaNewConsumer
+	KafkaNewConsumer = func(config *kafka.ConfigMap) (*kafka.Consumer, error) {
 		return nil, fmt.Errorf("mock error creating consumer")
-	})
-	defer monkey.Unpatch(kafka.NewConsumer)
+	}
 
 	consumer, err := NewKafkaConsumer()
 	assert.Nil(t, consumer)
 	assert.EqualError(t, err, "Kafka Consumer instance not created")
+	KafkaNewConsumer = originalNewKafkaConsumer
 }
 
 // Test for error creating kafka instance
 func TestNewKafkaConsumer_NilConsumer(t *testing.T) {
 	resetKafkaConsumerSingleton()
-	monkey.Patch(kafka.NewConsumer, func(config *kafka.ConfigMap) (*kafka.Consumer, error) {
+	originalNewKafkaConsumer := KafkaNewConsumer
+	KafkaNewConsumer = func(config *kafka.ConfigMap) (*kafka.Consumer, error) {
 		return nil, nil
-	})
-	defer monkey.Unpatch(kafka.NewConsumer)
+	}
 
 	consumer, err := NewKafkaConsumer()
 	assert.Nil(t, consumer)
 	assert.EqualError(t, err, "Kafka Consumer instance not created")
+	KafkaNewConsumer = originalNewKafkaConsumer
 }
diff --git a/pkg/kafkacomm/pdp_topic_producer.go b/pkg/kafkacomm/pdp_topic_producer.go
index 7847e00..13cd271 100644
--- a/pkg/kafkacomm/pdp_topic_producer.go
+++ b/pkg/kafkacomm/pdp_topic_producer.go
@@ -31,6 +31,7 @@ import (
 type KafkaProducerInterface interface {
 	Produce(*kafka.Message, chan kafka.Event) error
 	Close()
+	Flush(timeout int) int
 }
 
 // KafkaProducer wraps a Kafka producer instance and a topic to provide
@@ -63,10 +64,10 @@ func GetKafkaProducer(bootstrapServers, topic string) (*KafkaProducer, error) {
 		}
 
 		if useSASL == "true" {
-			configMap.SetKey("sasl.mechanism", "SCRAM-SHA-512")
-			configMap.SetKey("sasl.username", username)
-			configMap.SetKey("sasl.password", password)
-			configMap.SetKey("security.protocol", "SASL_PLAINTEXT")
+			configMap.SetKey("sasl.mechanism", "SCRAM-SHA-512") // #nosec G104
+			configMap.SetKey("sasl.username", username) // #nosec G104
+			configMap.SetKey("sasl.password", password) // #nosec G104
+			configMap.SetKey("security.protocol", "SASL_PLAINTEXT") // #nosec G104
 		}
 
 		p, err := kafka.NewProducer(configMap)
@@ -106,6 +107,11 @@ func (kp *KafkaProducer) Close() {
 		log.Println("KafkaProducer or producer is nil, skipping Close.")
 		return
 	}
+	kp.producer.Flush(15*1000)
 	kp.producer.Close()
 	log.Println("KafkaProducer closed successfully.")
 }
+
+func (kp *KafkaProducer) Flush(timeout int) int {
+	return kp.producer.Flush(15 * 1000)
+}
diff --git a/pkg/kafkacomm/pdp_topic_producer_test.go b/pkg/kafkacomm/pdp_topic_producer_test.go
index b466d1d..dfdad4b 100644
--- a/pkg/kafkacomm/pdp_topic_producer_test.go
+++ b/pkg/kafkacomm/pdp_topic_producer_test.go
@@ -113,6 +113,8 @@ func TestKafkaProducer_Close(t *testing.T) {
 		producer: mockProducer,
 	}
 
+        mockProducer.On("Flush", mock.AnythingOfType("int")).Return(0)
+
 	// Simulate successful close
 	mockProducer.On("Close").Return()
 
@@ -130,6 +132,7 @@ func TestKafkaProducer_Close_Error(t *testing.T) {
 		producer: mockProducer,
 	}
 
+	mockProducer.On("Flush", mock.AnythingOfType("int")).Return(-1)
 	// Simulate close error
 	mockProducer.On("Close").Return()
 
@@ -160,6 +163,7 @@ func mockKafkaNewProducer(conf *kafka.ConfigMap) (*kafka.Producer, error) {
 	mockProducer := new(MockKafkaProducer)
 	mockProducer.On("Produce", mock.Anything, mock.Anything).Return(nil)
 	mockProducer.On("Close").Return()
+	mockProducer.On("Flush").Return()
 	return &kafka.Producer{}, nil
 }
 
diff --git a/pkg/kafkacomm/publisher/pdp-heartbeat.go b/pkg/kafkacomm/publisher/pdp-heartbeat.go
index 0f68840..7cc9beb 100644
--- a/pkg/kafkacomm/publisher/pdp-heartbeat.go
+++ b/pkg/kafkacomm/publisher/pdp-heartbeat.go
@@ -128,6 +128,7 @@ func StopTicker() {
 	if ticker != nil && stopChan != nil {
 		stopChan <- true
 		close(stopChan)
+		ticker.Stop()
 		ticker = nil
 		stopChan = nil
 	} else {
diff --git a/pkg/kafkacomm/publisher/pdp-heartbeat_test.go b/pkg/kafkacomm/publisher/pdp-heartbeat_test.go
index c3676c8..bdf202c 100644
--- a/pkg/kafkacomm/publisher/pdp-heartbeat_test.go
+++ b/pkg/kafkacomm/publisher/pdp-heartbeat_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"policy-opa-pdp/pkg/kafkacomm/publisher/mocks"
+	"policy-opa-pdp/pkg/policymap"
 	"testing"
 )
 
@@ -101,6 +102,46 @@ func TestSendPDPHeartBeat_Failure(t *testing.T) {
 }
 
 /*
+TestsendPDPHeartBeat_Success 3
+Description: Test sending a heartbeat successfully with some deployed policies.
+Input: Valid pdpStatus object
+Expected Output: Heartbeat message is sent successfully, and a debug log "Message sent successfully" is generated.
+*/
+func TestSendPDPHeartBeat_SuccessSomeDeployedPolicies(t *testing.T) {
+         // Setup mock Policymap
+        mockPolicymap := new(MockPolicymap)
+
+        mockSender := new(mocks.PdpStatusSender)
+        mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+        policymap.LastDeployedPolicies = "some-policies"
+        // Set mock behavior for policymap
+        mockPolicymap.On("ExtractDeployedPolicies", mock.Anything).Return(nil)
+        err := sendPDPHeartBeat(mockSender)
+        assert.NoError(t, err)
+}
+
+/*
+TestsendPDPHeartBeat_Success 4
+Description: Test sending a heartbeat successfully with no deployed policies.
+Input: Valid pdpStatus object
+Expected Output: Heartbeat message is sent successfully, and a debug log "Message sent successfully" is generated.
+*/
+func TestSendPDPHeartBeat_SuccessNoDeployedPolicies(t *testing.T) {
+         // Setup mock Policymap
+        mockPolicymap := new(MockPolicymap)
+
+        mockSender := new(mocks.PdpStatusSender)
+        mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+
+        policymap.LastDeployedPolicies = ""
+        // Set mock behavior for policymap
+        mockPolicymap.On("ExtractDeployedPolicies", mock.Anything).Return(nil)
+        err := sendPDPHeartBeat(mockSender)
+        assert.NoError(t, err)
+}
+
+/*
 TestStopTicker_Success 3
 Description: Test stopping the ticker.
 Input: Ticker is running
diff --git a/pkg/kafkacomm/publisher/pdp-pap-registration_test.go b/pkg/kafkacomm/publisher/pdp-pap-registration_test.go
index b41bec5..6826099 100644
--- a/pkg/kafkacomm/publisher/pdp-pap-registration_test.go
+++ b/pkg/kafkacomm/publisher/pdp-pap-registration_test.go
@@ -77,6 +77,11 @@ func (m *MockKafkaProducer) Close() {
 	m.Called()
 }
 
+func (m *MockKafkaProducer) Flush(timeout int) int {
+        m.Called(timeout)
+	return 0
+}
+
 // Test the SendPdpStatus method
 func TestSendPdpStatus_Success(t *testing.T) {
 	// Create the mock producer
@@ -86,6 +91,7 @@ func TestSendPdpStatus_Success(t *testing.T) {
 	mockProducer.On("Produce", mock.Anything).Return(nil)
 	//t.Fatalf("Inside Sender checking for producer , but got: %v", mockProducer)
 
+
 	// Create the RealPdpStatusSender with the mocked producer
 	sender := RealPdpStatusSender{
 		Producer: mockProducer,
diff --git a/pkg/kafkacomm/publisher/pdp-status-publisher_test.go b/pkg/kafkacomm/publisher/pdp-status-publisher_test.go
index 17805fe..2e2be1c 100644
--- a/pkg/kafkacomm/publisher/pdp-status-publisher_test.go
+++ b/pkg/kafkacomm/publisher/pdp-status-publisher_test.go
@@ -1,6 +1,6 @@
 // -
 //   ========================LICENSE_START=================================
-//   Copyright (C) 2024: Deutsche Telekom
+//   Copyright (C) 2024-2025: Deutsche Telekom
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -25,9 +25,24 @@ import (
 	"github.com/stretchr/testify/mock"
 	"policy-opa-pdp/pkg/kafkacomm/publisher/mocks"
 	"policy-opa-pdp/pkg/model"
+	"policy-opa-pdp/pkg/policymap"
 	"testing"
 )
 
+// Mock Policymap
+type MockPolicymap struct {
+    mock.Mock
+}
+
+func (m *MockPolicymap) ExtractDeployedPolicies(policiesMap string) []model.ToscaConceptIdentifier {
+    args := m.Called(policiesMap)
+    return args.Get(0).([]model.ToscaConceptIdentifier)
+}
+
+func (m *MockPolicymap) SetLastDeployedPolicies(policiesMap string) {
+    m.Called(policiesMap)
+}
+
 // TestSendPdpUpdateResponse_Success tests SendPdpUpdateResponse for a successful response
 func TestSendPdpUpdateResponse_Success(t *testing.T) {
 
@@ -55,10 +70,92 @@ func TestSendPdpUpdateResponse_Failure(t *testing.T) {
 	mockSender.AssertCalled(t, "SendPdpStatus", mock.Anything)
 }
 
+// TestSendPdpUpdateResponse_Success tests SendPdpUpdateResponse for a successful response with no deployed policy
+func TestSendPdpUpdateResponse_Success_NoPolicies(t *testing.T) {
+	mockPolicymap := new(MockPolicymap)
+
+
+        mockSender := new(mocks.PdpStatusSender)
+        mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+        pdpUpdate := &model.PdpUpdate{RequestId: "test-request-id"}
+	policymap.LastDeployedPolicies = ""
+        mockPolicymap.On("ExtractDeployedPolicies", mock.Anything).Return(nil)
+
+        err := SendPdpUpdateResponse(mockSender, pdpUpdate, "PDPUpdate Successful")
+        assert.NoError(t, err)
+        mockSender.AssertCalled(t, "SendPdpStatus", mock.Anything)
+}
+
+// TestSendPdpUpdateResponse_Success tests SendPdpUpdateResponse for a successful response with some policies
+func TestSendPdpUpdateResponse_Success_SomeDeployedPolicies(t *testing.T) {
+	mockPolicymap := new(MockPolicymap)
+        mockSender := new(mocks.PdpStatusSender)
+        mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
+        pdpUpdate := &model.PdpUpdate{RequestId: "test-request-id"}
+        policymap.LastDeployedPolicies = "some-policies"
+        mockPolicymap.On("ExtractDeployedPolicies", mock.Anything).Return(nil)
+        err := SendPdpUpdateResponse(mockSender, pdpUpdate, "PDPUpdate Successful")
+        assert.NoError(t, err)
+        mockSender.AssertCalled(t, "SendPdpStatus", mock.Anything)
+}
+
+// TestSendPdpUpdateErrorResponse_Success tests SendPdpUpdateResponse
+func TestSendPdpUpdateErrorResponse(t *testing.T) {
+
+        mockSender := new(mocks.PdpStatusSender)
+        mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("Sending error response"))
+
+        pdpUpdate := &model.PdpUpdate{RequestId: "test-request-id"}
+
+        mockerr := errors.New("Sending Error response")
+        err := SendPdpUpdateErrorResponse(mockSender, pdpUpdate, mockerr)
+
+        assert.Error(t, err)
+
+        mockSender.AssertCalled(t, "SendPdpStatus", mock.Anything)
+}
+
+// TestSendPdpUpdateErrorResponse_Success tests SendPdpUpdateResponse for some policies
+func TestSendPdpUpdateErrorResponse_SomeDeployedPolicies(t *testing.T) {
+         // Setup mock Policymap
+        mockPolicymap := new(MockPolicymap)
+
+        mockSender := new(mocks.PdpStatusSender)
+        mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("Sending error response"))
+        pdpUpdate := &model.PdpUpdate{RequestId: "test-request-id"}
+
+        policymap.LastDeployedPolicies = "some-policies"
+        // Set mock behavior for policymap
+        mockPolicymap.On("ExtractDeployedPolicies", mock.Anything).Return(nil)
+        mockerr := errors.New("Sending Error response")
+        err := SendPdpUpdateErrorResponse(mockSender, pdpUpdate, mockerr)
+        assert.Error(t, err)
+        //mockPolicymap.AssertExpectations(t)
+        mockSender.AssertCalled(t, "SendPdpStatus", mock.Anything)
+}
+
+// TestSendPdpUpdateErrorResponse_Success tests SendPdpUpdateResponse for no policies
+func TestSendPdpUpdateErrorResponse_NoPolicies(t *testing.T) {
+         // Setup mock Policymap
+        mockPolicymap := new(MockPolicymap)
+
+        mockSender := new(mocks.PdpStatusSender)
+        mockSender.On("SendPdpStatus", mock.Anything).Return(errors.New("Sending error response"))
+        pdpUpdate := &model.PdpUpdate{RequestId: "test-request-id"}
+
+        policymap.LastDeployedPolicies = ""
+        // Set mock behavior for policymap
+        mockPolicymap.On("ExtractDeployedPolicies", mock.Anything).Return(nil)
+        mockerr := errors.New("Sending Error response")
+        err := SendPdpUpdateErrorResponse(mockSender, pdpUpdate, mockerr)
+        assert.Error(t, err)
+        //mockPolicymap.AssertExpectations(t)
+        mockSender.AssertCalled(t, "SendPdpStatus", mock.Anything)
+}
 // TestSendStateChangeResponse_Success tests SendStateChangeResponse for a successful state change response
 func TestSendStateChangeResponse_Success(t *testing.T) {
 
-	mockSender := new(mocks.PdpStatusSender)
+        mockSender := new(mocks.PdpStatusSender)
 	mockSender.On("SendPdpStatus", mock.Anything).Return(nil)
 
 	pdpStateChange := &model.PdpStateChange{RequestId: "test-state-change-id"}
diff --git a/pkg/metrics/counters_test.go b/pkg/metrics/counters_test.go
index 852e365..9d41e95 100644
--- a/pkg/metrics/counters_test.go
+++ b/pkg/metrics/counters_test.go
@@ -85,4 +85,58 @@ func TestCounters(t *testing.T) {
 
 	assert.Equal(t, int64(3), *TotalDecisionFailureCountRef())
 
+
+// Test IncrementDeploySuccessCount and totalDeploySuccessCountRef
+	DeploySuccessCount = 0
+	wg.Add(4)
+	for i := 0; i < 4; i++ {
+		go func() {
+			defer wg.Done()
+			IncrementDeploySuccessCount()
+		}()
+	}
+	wg.Wait()
+	assert.Equal(t, int64(4), *totalDeploySuccessCountRef())
+
+// Test IncrementDeployFailureCount and totalDeployFailureCountRef
+	DeployFailureCount = 0
+	wg.Add(2)
+	for i := 0; i < 2; i++ {
+		go func() {
+			defer wg.Done()
+			IncrementDeployFailureCount()
+		}()
+	}
+	wg.Wait()
+	assert.Equal(t, int64(2), *totalDeployFailureCountRef())
+
+// Test IncrementUndeploySuccessCount and totalUndeploySuccessCountRef
+	UndeploySuccessCount = 0
+	wg.Add(6)
+	for i := 0; i < 6; i++ {
+		go func() {
+			defer wg.Done()
+			IncrementUndeploySuccessCount()
+		}()
+	}
+	wg.Wait()
+	assert.Equal(t, int64(6), *totalUndeploySuccessCountRef())
+
+// Test IncrementUndeployFailureCount and totalUndeployFailureCountRef
+	UndeployFailureCount = 0
+	wg.Add(1)
+	for i := 0; i < 1; i++ {
+		go func() {
+			defer wg.Done()
+			IncrementUndeployFailureCount()
+		}()
+	}
+	wg.Wait()
+	assert.Equal(t, int64(1), *totalUndeployFailureCountRef())
+
+// Test SetTotalPoliciesCount and totalPoliciesCountRef
+	SetTotalPoliciesCount(15)
+	assert.Equal(t, int64(15), *totalPoliciesCountRef())
+
+
 }
diff --git a/pkg/metrics/statistics-provider_test.go b/pkg/metrics/statistics-provider_test.go
index cf745a2..94684c5 100644
--- a/pkg/metrics/statistics-provider_test.go
+++ b/pkg/metrics/statistics-provider_test.go
@@ -30,6 +30,14 @@ import (
 )
 
 func TestFetchCurrentStatistics(t *testing.T) {
+         TotalErrorCount = 0
+	DecisionSuccessCount = 0
+	DecisionFailureCount = 0
+	DeployFailureCount = 0
+	DeploySuccessCount = 0
+	UndeployFailureCount = 0
+	UndeploySuccessCount = 0
+	TotalPoliciesCount = 0
 
 	TotalErrorCount = 5
 
@@ -64,6 +72,14 @@ func TestFetchCurrentStatistics(t *testing.T) {
 }
 
 func TestFetchCurrentStatistics_ValidRequestID(t *testing.T) {
+        TotalErrorCount = 0
+	DecisionSuccessCount = 0
+	DecisionFailureCount = 0
+	DeployFailureCount = 0
+	DeploySuccessCount = 0
+	UndeployFailureCount = 0
+	UndeploySuccessCount = 0
+	TotalPoliciesCount = 0
 
 	validUUID := "123e4567-e89b-12d3-a456-426614174000"
 
diff --git a/pkg/model/oapicodegen/models.go b/pkg/model/oapicodegen/models.go
index e90b94b..dc51713 100644
--- a/pkg/model/oapicodegen/models.go
+++ b/pkg/model/oapicodegen/models.go
@@ -4,8 +4,10 @@
 package oapicodegen
 
 import (
+	"encoding/json"
 	"time"
 
+	"github.com/oapi-codegen/runtime"
 	openapi_types "github.com/oapi-codegen/runtime/types"
 )
 
@@ -46,6 +48,40 @@ type HealthCheckReport struct {
 	Url     *string `json:"url,omitempty"`
 }
 
+// OPADataResponse defines model for OPADataResponse.
+type OPADataResponse struct {
+	Data *OPADataResponse_Data `json:"data,omitempty"`
+}
+
+// OPADataResponseData0 defines model for .
+type OPADataResponseData0 = interface{}
+
+// OPADataResponseData1 defines model for .
+type OPADataResponseData1 map[string]interface{}
+
+// OPADataResponse_Data defines model for OPADataResponse.Data.
+type OPADataResponse_Data struct {
+	union json.RawMessage
+}
+
+// OPADataUpdateRequest defines model for OPADataUpdateRequest.
+type OPADataUpdateRequest struct {
+	CurrentDate     *openapi_types.Date       `json:"currentDate,omitempty"`
+	CurrentDateTime *time.Time                `json:"currentDateTime,omitempty"`
+	CurrentTime     *string                   `json:"currentTime,omitempty"`
+	Data            *[]map[string]interface{} `json:"data,omitempty"`
+	OnapComponent   *string                   `json:"onapComponent,omitempty"`
+	OnapInstance    *string                   `json:"onapInstance,omitempty"`
+	OnapName        *string                   `json:"onapName,omitempty"`
+	PolicyName      *string                   `json:"policyName,omitempty"`
+
+	// TimeOffset Time offset in hours and minutes, e.g., '+02:00' or '-05:00'
+	TimeOffset *string `json:"timeOffset,omitempty"`
+
+	// TimeZone Timezone in IANA format (e.g., 'America/NewYork', 'Europe/Paris', 'UTC')
+	TimeZone *string `json:"timeZone,omitempty"`
+}
+
 // OPADecisionRequest defines model for OPADecisionRequest.
 type OPADecisionRequest struct {
 	CurrentDate     *openapi_types.Date    `json:"currentDate,omitempty"`
@@ -86,6 +122,18 @@ type StatisticsReport struct {
 	UndeploySuccessCount  *int64 `json:"undeploySuccessCount,omitempty"`
 }
 
+// DataGetParams defines parameters for DataGet.
+type DataGetParams struct {
+	// XONAPRequestID RequestID for http transaction
+	XONAPRequestID *openapi_types.UUID `json:"X-ONAP-RequestID,omitempty"`
+}
+
+// PatchdataParams defines parameters for Patchdata.
+type PatchdataParams struct {
+	// XONAPRequestID RequestID for http transaction
+	XONAPRequestID *openapi_types.UUID `json:"X-ONAP-RequestID,omitempty"`
+}
+
 // DecisionParams defines parameters for Decision.
 type DecisionParams struct {
 	// XONAPRequestID RequestID for http transaction
@@ -104,5 +152,70 @@ type StatisticsParams struct {
 	XONAPRequestID *openapi_types.UUID `json:"X-ONAP-RequestID,omitempty"`
 }
 
+// PatchdataJSONRequestBody defines body for Patchdata for application/json ContentType.
+type PatchdataJSONRequestBody = OPADataUpdateRequest
+
 // DecisionJSONRequestBody defines body for Decision for application/json ContentType.
 type DecisionJSONRequestBody = OPADecisionRequest
+
+// AsOPADataResponseData0 returns the union data inside the OPADataResponse_Data as a OPADataResponseData0
+func (t OPADataResponse_Data) AsOPADataResponseData0() (OPADataResponseData0, error) {
+	var body OPADataResponseData0
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromOPADataResponseData0 overwrites any union data inside the OPADataResponse_Data as the provided OPADataResponseData0
+func (t *OPADataResponse_Data) FromOPADataResponseData0(v OPADataResponseData0) error {
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeOPADataResponseData0 performs a merge with any union data inside the OPADataResponse_Data, using the provided OPADataResponseData0
+func (t *OPADataResponse_Data) MergeOPADataResponseData0(v OPADataResponseData0) error {
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JsonMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+// AsOPADataResponseData1 returns the union data inside the OPADataResponse_Data as a OPADataResponseData1
+func (t OPADataResponse_Data) AsOPADataResponseData1() (OPADataResponseData1, error) {
+	var body OPADataResponseData1
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromOPADataResponseData1 overwrites any union data inside the OPADataResponse_Data as the provided OPADataResponseData1
+func (t *OPADataResponse_Data) FromOPADataResponseData1(v OPADataResponseData1) error {
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeOPADataResponseData1 performs a merge with any union data inside the OPADataResponse_Data, using the provided OPADataResponseData1
+func (t *OPADataResponse_Data) MergeOPADataResponseData1(v OPADataResponseData1) error {
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JsonMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+func (t OPADataResponse_Data) MarshalJSON() ([]byte, error) {
+	b, err := t.union.MarshalJSON()
+	return b, err
+}
+
+func (t *OPADataResponse_Data) UnmarshalJSON(b []byte) error {
+	err := t.union.UnmarshalJSON(b)
+	return err
+}
diff --git a/pkg/opasdk/opasdk.go b/pkg/opasdk/opasdk.go
index 81b94ce..50edba4 100644
--- a/pkg/opasdk/opasdk.go
+++ b/pkg/opasdk/opasdk.go
@@ -1,6 +1,6 @@
 // -
 //   ========================LICENSE_START=================================
-//   Copyright (C) 2024: Deutsche Telekom
+//   Copyright (C) 2024-2025: Deutsche Telekom
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -25,17 +25,21 @@ package opasdk
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"policy-opa-pdp/consts"
 	"policy-opa-pdp/pkg/log"
+	"strings"
 	"sync"
 
-	"github.com/open-policy-agent/opa/sdk"
-	"github.com/open-policy-agent/opa/storage"
 	"github.com/open-policy-agent/opa/storage/inmem"
+	"github.com/open-policy-agent/opa/v1/ast"
+	"github.com/open-policy-agent/opa/v1/sdk"
+	"github.com/open-policy-agent/opa/v1/storage"
+	"policy-opa-pdp/pkg/model/oapicodegen"
 )
 
 // Define the structs
@@ -43,8 +47,21 @@ var (
 	opaInstance *sdk.OPA  //A singleton instance of the OPA object
 	once        sync.Once //A sync.Once variable used to ensure that the OPA instance is initialized only once,
 	memStore    storage.Store
+	UpsertPolicyVar UpsertPolicyFunc = UpsertPolicy
+        WriteDataVar    WriteDataFunc    = WriteData
 )
 
+type (
+        UpsertPolicyFunc func(ctx context.Context, policyID string, policyContent []byte) error
+        WriteDataFunc    func(ctx context.Context, dataPath string, data interface{}) error
+)
+
+type PatchImpl struct {
+	Path  storage.Path
+	Op    storage.PatchOp
+	Value interface{}
+}
+
 // reads JSON configuration from a file and return a jsonReader
 func getJSONReader(filePath string, openFunc func(string) (*os.File, error),
 	readAllFunc func(io.Reader) ([]byte, error)) (*bytes.Reader, error) {
@@ -63,14 +80,17 @@ func getJSONReader(filePath string, openFunc func(string) (*os.File, error),
 	return jsonReader, nil
 }
 
+type NewSDKFunc func(ctx context.Context, options sdk.Options) (*sdk.OPA, error)
+var NewSDK NewSDKFunc = sdk.New
+
 // Returns a singleton instance of the OPA object. The initialization of the instance is
 // thread-safe, and the OPA object is configured using a JSON configuration file.
 func GetOPASingletonInstance() (*sdk.OPA, error) {
 	var err error
 	once.Do(func() {
-		var opaErr error
+	        var opaErr error
 		memStore = inmem.New()
-		opaInstance, opaErr = sdk.New(context.Background(), sdk.Options{
+	        opaInstance, opaErr = NewSDK(context.Background(), sdk.Options{
 			// Configure your OPA instance here
 			V1Compatible: true,
 			Store:        memStore,
@@ -89,9 +109,12 @@ func GetOPASingletonInstance() (*sdk.OPA, error) {
 			}
 			log.Debugf("Configure an instance of OPA Object")
 
-			opaInstance.Configure(context.Background(), sdk.ConfigOptions{
+			err := opaInstance.Configure(context.Background(), sdk.ConfigOptions{
 				Config: jsonReader,
 			})
+			if err != nil {
+			    log.Warnf("Failed to configure OPA: %v", err)
+			}
 		}
 	})
 	return opaInstance, err
@@ -196,6 +219,7 @@ func DeleteData(ctx context.Context, dataPath string) error {
 	return nil
 }
 
+// Added below method to test get policies (added for testing purpose only)
 func ListPolicies(res http.ResponseWriter, req *http.Request) {
 	ctx := context.Background()
 	rtxn, err := memStore.NewTransaction(ctx, storage.TransactionParams{Write: false})
@@ -226,7 +250,9 @@ func ListPolicies(res http.ResponseWriter, req *http.Request) {
 	}
 	memStore.Abort(ctx, rtxn)
 	res.WriteHeader(http.StatusOK)
-	res.Write([]byte("Check logs"))
+	if _, err := res.Write([]byte("Check logs")); err != nil {
+		log.Warnf("Warning: Failed to write response: %v", err)
+	}
 }
 
 func initializePath(ctx context.Context, txn storage.Transaction, path string) error {
@@ -249,3 +275,103 @@ func initializePath(ctx context.Context, txn storage.Transaction, path string) e
 	}
 	return nil
 }
+
+func PatchData(ctx context.Context, patches []PatchImpl) error {
+	txn, err := memStore.NewTransaction(ctx, storage.WriteParams)
+	if err != nil {
+		log.Warnf("Error in creating transaction: %s", err)
+		memStore.Abort(ctx, txn)
+		return err
+	}
+
+	for _, patch := range patches {
+		err = memStore.Write(ctx, txn, patch.Op, patch.Path, patch.Value)
+		path := (patch.Path).String()
+		if err != nil {
+			log.Warnf("Error in writing data under "+path+" in memory: %s", err)
+			memStore.Abort(ctx, txn)
+			return err
+		}
+	}
+
+	// Create a new compiler instance
+	compiler := ast.NewCompiler()
+
+	// Check for path conflicts
+	errInfo := ast.CheckPathConflicts(compiler, storage.NonEmpty(ctx, memStore, txn))
+	if len(errInfo) > 0 {
+		memStore.Abort(ctx, txn)
+		log.Errorf("Path conflicts detected: %s", errInfo)
+		return errInfo
+	} else {
+		log.Debugf("No path conflicts detected")
+	}
+
+	err = memStore.Commit(ctx, txn)
+	if err != nil {
+		log.Warnf("Error in commiting the transaction: %s", err)
+		memStore.Abort(ctx, txn)
+		return err
+	}
+	return nil
+}
+
+func GetDataInfo(ctx context.Context, dataPath string) (data *oapicodegen.OPADataResponse_Data, err error) {
+
+	rtxn, _ := memStore.NewTransaction(ctx, storage.TransactionParams{Write: false})
+	defer memStore.Abort(ctx, rtxn) // Ensure transaction is aborted to avoid leaks
+	path := storage.MustParsePath(dataPath)
+
+	result, err := memStore.Read(ctx, rtxn, path)
+	if err != nil {
+		log.Warnf("Error in reading data under " + dataPath + " path")
+		return nil, err
+	}
+
+	jsonData, err := json.Marshal(result)
+	if err != nil {
+		log.Warnf("Error in converting result into json data %s", err)
+		return nil, err
+	}
+
+	log.Debugf("Json Data at %s: %s\n", path, jsonData)
+
+	var resData oapicodegen.OPADataResponse_Data
+
+	err = json.Unmarshal(jsonData, &resData)
+	if err != nil {
+		log.Errorf("Error in unmarshalling data: %s", err)
+		return nil, err
+	}
+
+	return &resData, nil
+}
+
+func ParsePatchPathEscaped(str string) (path storage.Path, ok bool) {
+	path, ok = storage.ParsePathEscaped(str)
+	if !ok {
+		return
+	}
+	for i := range path {
+		// RFC 6902 section 4: "[The "path" member's] value is a string containing
+		// a JSON-Pointer value [RFC6901] that references a location within the
+		// target document (the "target location") where the operation is performed."
+		//
+		// RFC 6901 section 3: "Because the characters '~' (%x7E) and '/' (%x2F)
+		// have special meanings in JSON Pointer, '~' needs to be encoded as '~0'
+		// and '/' needs to be encoded as '~1' when these characters appear in a
+		// reference token."
+
+		// RFC 6901 section 4: "Evaluation of each reference token begins by
+		// decoding any escaped character sequence.  This is performed by first
+		// transforming any occurrence of the sequence '~1' to '/', and then
+		// transforming any occurrence of the sequence '~0' to '~'.  By performing
+		// the substitutions in this order, an implementation avoids the error of
+		// turning '~01' first into '~1' and then into '/', which would be
+		// incorrect (the string '~01' correctly becomes '~1' after transformation)."
+		path[i] = strings.Replace(path[i], "~1", "/", -1)
+		path[i] = strings.Replace(path[i], "~0", "~", -1)
+	}
+
+	return
+}
diff --git a/pkg/opasdk/opasdk_test.go b/pkg/opasdk/opasdk_test.go
index 2517376..3ed4be1 100644
--- a/pkg/opasdk/opasdk_test.go
+++ b/pkg/opasdk/opasdk_test.go
@@ -20,18 +20,21 @@
 package opasdk
 
 import (
-	"bou.ke/monkey"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/open-policy-agent/opa/sdk"
+	"github.com/open-policy-agent/opa/v1/storage"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"io"
+	"net/http/httptest"
 	"os"
 	"policy-opa-pdp/consts"
 	"sync"
 	"testing"
+	"net/http"
 )
 
 // Mock for os.Open
@@ -53,6 +56,78 @@ type MockSDK struct {
 	mock.Mock
 }
 
+type MockStorage struct {
+	mock.Mock
+}
+
+type MockTransaction struct{}
+
+func (m *MockTransaction) ID() uint64 {
+	return 1
+}
+
+func (m *MockStorage) NewTransaction(ctx context.Context, params ...storage.TransactionParams) (storage.Transaction, error) {
+	args := m.Called(ctx, params)
+	return &MockTransaction{}, args.Error(1)
+}
+
+// Fix: Ensure `txn` is `storage.Transaction`
+func (m *MockStorage) Read(ctx context.Context, txn storage.Transaction, path storage.Path) (interface{}, error) {
+	args := m.Called(ctx, txn, path)
+	return args.Get(0), args.Error(1)
+}
+
+// Fix: Ensure `txn` is `storage.Transaction`
+func (m *MockStorage) Write(ctx context.Context, txn storage.Transaction, op storage.PatchOp, path storage.Path, value interface{}) error {
+	args := m.Called(ctx, txn, op, path, value)
+	return args.Error(0)
+}
+
+// Fix: Ensure `txn` is `storage.Transaction`
+func (m *MockStorage) Commit(ctx context.Context, txn storage.Transaction) error {
+	args := m.Called(ctx, txn)
+	return args.Error(0)
+}
+
+// Fix: Ensure `txn` is `storage.Transaction`
+func (m *MockStorage) Abort(ctx context.Context, txn storage.Transaction) {
+	m.Called(ctx, txn)
+}
+
+// Implement the Register method.
+func (m *MockStorage) Register(ctx context.Context, txn storage.Transaction, config storage.TriggerConfig) (storage.TriggerHandle, error) {
+	// Return mock values (adjust as needed for tests)
+	return nil, nil
+}
+
+func (m *MockStorage) Truncate(ctx context.Context, txn storage.Transaction, params storage.TransactionParams, iter storage.Iterator) error {
+	return nil // Adjust return as needed for your test
+}
+
+func (m *MockStorage) DeletePolicy(ctx context.Context, txn storage.Transaction, id string) error {
+	args := m.Called(ctx, txn, id)
+	return args.Error(0)
+}
+
+func (m *MockStorage) UpsertPolicy(ctx context.Context, txn storage.Transaction, policyID string, policyContent []byte) error {
+	args := m.Called(ctx, txn, policyID, policyContent)
+	return args.Error(0)
+}
+
+func (m *MockStorage) GetPolicy(ctx context.Context, txn storage.Transaction, id string) ([]byte, error) {
+	args := m.Called(ctx, txn, id)
+	return args.Get(0).([]byte), args.Error(1)
+}
+
+func (m *MockStorage) ListPolicies(ctx context.Context, txn storage.Transaction) ([]string, error) {
+	args := m.Called(ctx, txn)
+	return args.Get(0).([]string), args.Error(1)
+}
+
+type MockData struct {
+	Value string `json:"value"`
+}
+
 func (m *MockSDK) New(ctx context.Context, options sdk.Options) (*sdk.OPA, error) {
 	fmt.Print("Inside New Method")
 	args := m.Called(ctx, options)
@@ -196,17 +271,17 @@ func TestGetJSONReader_ReadAllError(t *testing.T) {
 }
 
 func TestGetOPASingletonInstance(t *testing.T) {
-    // Call your function under test
-    opaInstance, err := GetOPASingletonInstance()
+	// Call your function under test
+	opaInstance, err := GetOPASingletonInstance()
 
-    // Assertions
-    if err != nil {
-        t.Errorf("Expected no error, got %v", err)
-    }
-    if opaInstance == nil {
-        t.Error("Expected OPA instance, got nil")
-    }
-    assert.NotNil(t, opaInstance, "OPA instance should be nil when sdk.New fails")
+	// Assertions
+	if err != nil {
+		t.Errorf("Expected no error, got %v", err)
+	}
+	if opaInstance == nil {
+		t.Error("Expected OPA instance, got nil")
+	}
+	assert.NotNil(t, opaInstance, "OPA instance should be nil when sdk.New fails")
 }
 
 // Helper to reset the singleton for testing
@@ -218,13 +293,589 @@ func resetSingleton() {
 // Test sdk.New failure scenario
 func TestGetOPASingletonInstance_SdkNewFails(t *testing.T) {
 	resetSingleton()
-	// Patch sdk.New to simulate a failure
-	monkey.Patch(sdk.New, func(ctx context.Context, options sdk.Options) (*sdk.OPA, error) {
+	NewSDK = func(ctx context.Context, options sdk.Options) (*sdk.OPA, error) {
 		return nil, errors.New("mocked error in sdk.New")
-	})
-	defer monkey.Unpatch(sdk.New)
+	}
 	opaInstance, err := GetOPASingletonInstance()
 	assert.Nil(t, opaInstance, "OPA instance should be nil when sdk.New fails")
 	assert.Error(t, err, "Expected an error when sdk.New fails")
 	assert.Contains(t, err.Error(), "mocked error in sdk.New")
 }
+
+func TestInitializePath_ReadSuccess(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(MockTransaction)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(nil, nil)
+
+	err := initializePath(ctx, txn, "/some/path")
+
+	assert.Nil(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestInitializePath_WriteError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(MockTransaction)
+
+	// Define the mock data in the same format as Read() would return
+	mockData := map[string]interface{}{"value": "testValue"}
+
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(mockData, errors.New("data write error"))
+
+	err := initializePath(ctx, txn, "/some/path")
+
+	assert.Error(t, err)
+	assert.Equal(t, "data write error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestWriteData_TransactionError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(nil, errors.New("transaction error"))
+	mockMemStore.On("Abort", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil) // Or any return value your method expects
+
+	var content interface{} = "test-content"
+	err := WriteData(ctx, "/some/path", content)
+
+	assert.Error(t, err)
+	assert.Equal(t, "transaction error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestWriteData_ReadError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(nil, errors.New("read error in initializePath method"))
+	mockMemStore.On("Abort", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil) // Or any return value your method expects
+
+	var content interface{} = "test-content"
+	err := WriteData(ctx, "/some/path", content)
+
+	assert.Error(t, err)
+	assert.Equal(t, "read error in initializePath method", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestWriteData_Failure(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(mock.Anything, nil)
+	mockMemStore.On("Write", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(errors.New("data write error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	var data interface{} = "test-content"
+	err := WriteData(ctx, "/some/path", data)
+
+	assert.Error(t, err)
+	assert.Equal(t, "data write error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestWriteData_CommitError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(mock.Anything, nil)
+	mockMemStore.On("Write", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(errors.New("commit error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	data := []byte("test-content")
+	err := WriteData(ctx, "/some/path", data)
+
+	assert.Error(t, err)
+	assert.Equal(t, "commit error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestWriteData_success(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(mock.Anything, nil)
+	mockMemStore.On("Write", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	data := []byte("test-content")
+	err := WriteData(ctx, "/some/path", data)
+
+	assert.Nil(t, err)
+	assert.NoError(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestUpsertPolicy_TransactionError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(nil, errors.New("transaction error"))
+	mockMemStore.On("Abort", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil) // Or any return value your method expects
+
+	policyContent := []byte("test-content")
+	err := UpsertPolicy(ctx, "policyId", policyContent)
+
+	assert.Error(t, err)
+	assert.Equal(t, "transaction error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestUpsertPolicy_Failure(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("UpsertPolicy", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything).Return(errors.New("upsert policy error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	policyContent := []byte("test-content")
+	err := UpsertPolicy(ctx, "policyId", policyContent)
+
+	assert.Error(t, err)
+	assert.Equal(t, "upsert policy error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestUpsertPolicy_CommitError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("UpsertPolicy", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(errors.New("commit error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	policyContent := []byte("test-content")
+	err := UpsertPolicy(ctx, "policyId", policyContent)
+
+	assert.Error(t, err)
+	assert.Equal(t, "commit error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestUpsertPolicy_Success(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("UpsertPolicy", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	policyContent := []byte("test-content")
+	err := UpsertPolicy(ctx, "policyId", policyContent)
+
+	assert.Nil(t, err)
+	assert.NoError(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestListPolicies_TransactionError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(nil, errors.New("transaction error"))
+	mockMemStore.On("Abort", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil) // Or any return value your method expects
+
+	req := httptest.NewRequest("GET", "/opa/listpolicies", nil)
+	res := httptest.NewRecorder()
+	ListPolicies(res, req)
+
+	assert.Equal(t, http.StatusInternalServerError, res.Code)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestListPolicies_Failure(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("ListPolicies", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return([]string{}, errors.New("ListPolicies error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	req := httptest.NewRequest("GET", "/opa/listpolicies", nil)
+	res := httptest.NewRecorder()
+	ListPolicies(res, req)
+
+	assert.Equal(t, http.StatusInternalServerError, res.Code)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestListPolicies_GetPolicyError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("ListPolicies", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return([]string{}, errors.New("GetPolicy error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	req := httptest.NewRequest("GET", "/opa/listpolicies", nil)
+	res := httptest.NewRecorder()
+	ListPolicies(res, req)
+
+	assert.Equal(t, http.StatusInternalServerError, res.Code)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestListPolicies_GetPolicySuccess(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("ListPolicies", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return([]string{"policyId"}, nil)
+	mockMemStore.On("GetPolicy", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), "policyId").Return([]byte{}, nil)
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	req := httptest.NewRequest("GET", "/opa/listpolicies", nil)
+	res := httptest.NewRecorder()
+	ListPolicies(res, req)
+
+//	assert.Nil(t, err)
+//	assert.NoError(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestListPolicies_Success(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("ListPolicies", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return([]string{}, nil)
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	req := httptest.NewRequest("GET", "/opa/listpolicies", nil)
+	res := httptest.NewRecorder()
+	ListPolicies(res, req)
+
+//	assert.NoError(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeletePolicy_TransactionError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(nil, errors.New("transaction error"))
+	mockMemStore.On("Abort", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil) // Or any return value your method expects
+
+	err := DeletePolicy(ctx, "policyId")
+
+	assert.Error(t, err)
+	assert.Equal(t, "transaction error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeletePolicy_Failure(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("DeletePolicy", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(errors.New("DeletePolicy error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	err := DeletePolicy(ctx, "policyId")
+
+	assert.Error(t, err)
+	assert.Equal(t, "DeletePolicy error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeletePolicy_CommitError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("DeletePolicy", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(errors.New("commit error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	err := DeletePolicy(ctx, "policyId")
+
+	assert.Error(t, err)
+	assert.Equal(t, "commit error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeletePolicy_Success(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("DeletePolicy", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	err := DeletePolicy(ctx, "policyId")
+
+	assert.Nil(t, err)
+	assert.NoError(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeleteData_TransactionError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(nil, errors.New("transaction error"))
+	mockMemStore.On("Abort", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil) // Or any return value your method expects
+
+	err := DeleteData(ctx, "/some/path")
+
+	assert.Error(t, err)
+	assert.Equal(t, "transaction error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeleteData_WriteError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Write", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(errors.New("write error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	err := DeleteData(ctx, "/some/path")
+
+	assert.Error(t, err)
+	assert.Equal(t, "write error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeleteData_CommitError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Write", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(errors.New("commit error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	err := DeleteData(ctx, "/some/path")
+
+	assert.Error(t, err)
+	assert.Equal(t, "commit error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestDeleteData_Success(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Write", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	err := DeleteData(ctx, "/some/path")
+
+	assert.Nil(t, err)
+	assert.NoError(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestPatchData_Success(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Write", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	patches := []PatchImpl{{Op: storage.AddOp, Path: storage.MustParsePath("/some/path"), Value: "value"}}
+	err := PatchData(ctx, patches)
+
+	assert.NoError(t, err)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestPatchData_TransactionError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(nil, errors.New("transaction error"))
+	mockMemStore.On("Abort", mock.Anything, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil) // Or any return value your method expects
+
+	patches := []PatchImpl{{Op: storage.AddOp, Path: storage.MustParsePath("/some/path"), Value: "value"}}
+	err := PatchData(ctx, patches)
+
+	assert.Error(t, err)
+	assert.Equal(t, "transaction error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestPatchData_WriteError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Write", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(errors.New("write error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	patches := []PatchImpl{{Op: storage.AddOp, Path: storage.MustParsePath("/some/path"), Value: "value"}}
+	err := PatchData(ctx, patches)
+
+	assert.Error(t, err)
+	assert.Equal(t, "write error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestPatchData_CommitError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Write", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	mockMemStore.On("Commit", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(errors.New("commit error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	patches := []PatchImpl{{Op: storage.AddOp, Path: storage.MustParsePath("/some/path"), Value: "value"}}
+	err := PatchData(ctx, patches)
+
+	assert.Error(t, err)
+	assert.Equal(t, "commit error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestGetDataInfo_Success(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	// Define the mock data in the same format as Read() would return
+	mockData := map[string]interface{}{"value": "testValue"}
+	mockDataJSON, _ := json.Marshal(mockData)
+
+	// Ensure mock expectations match actual function calls
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), storage.MustParsePath("/some/path")).Return(mockData, nil)
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	data, err := GetDataInfo(ctx, "/some/path")
+
+	// Assertions
+	assert.NoError(t, err)
+	assert.NotNil(t, data)
+
+	dataJson, errInfo := json.Marshal(data)
+	assert.NoError(t, errInfo)
+
+	assert.JSONEq(t, string(mockDataJSON), string(dataJson))
+	mockMemStore.AssertExpectations(t)
+
+}
+
+func TestGetDataInfo_ReadError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), storage.MustParsePath("/some/path")).Return(nil, errors.New("read error"))
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	data, err := GetDataInfo(ctx, "/some/path")
+
+	assert.Error(t, err)
+	assert.Nil(t, data)
+	assert.Equal(t, "read error", err.Error())
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestGetDataInfo_JSONUnmarshalError(t *testing.T) {
+	ctx := context.Background()
+	mockMemStore := new(MockStorage) // Create mock instance
+	memStore = mockMemStore
+	txn := new(storage.Transaction)
+	invalidData := make(chan int) // Invalid type for JSON marshalling
+
+	mockMemStore.On("NewTransaction", ctx, mock.Anything).Return(txn, nil)
+	mockMemStore.On("Read", ctx, mock.AnythingOfType("*opasdk.MockTransaction"), storage.MustParsePath("/some/path")).Return(invalidData, nil)
+	mockMemStore.On("Abort", ctx, mock.AnythingOfType("*opasdk.MockTransaction")).Return(nil)
+
+	data, err := GetDataInfo(ctx, "/some/path")
+
+	assert.Error(t, err)
+	assert.Nil(t, data)
+	mockMemStore.AssertExpectations(t)
+}
+
+func TestParsePatchPathEscaped_Success(t *testing.T) {
+	cases := []struct {
+		input    string
+		expected storage.Path
+	}{
+		{"/valid/path", storage.Path{"valid", "path"}},
+		{"/escaped~1path", storage.Path{"escaped/path"}},
+		{"/double~1escaped~0tilde", storage.Path{"double/escaped~tilde"}},
+	}
+
+	for _, tc := range cases {
+		path, ok := ParsePatchPathEscaped(tc.input)
+		assert.True(t, ok)
+		assert.Equal(t, tc.expected, path)
+	}
+}
+
+func TestParsePatchPathEscaped_Failure(t *testing.T) {
+	cases := []string{
+		"",         // Empty string
+		"~invalid", // Invalid leading tilde
+	}
+
+	for _, input := range cases {
+		path, ok := ParsePatchPathEscaped(input)
+		assert.False(t, ok)
+		assert.Nil(t, path)
+	}
+}
diff --git a/pkg/policymap/policy_and_data_map.go b/pkg/policymap/policy_and_data_map.go
index 5e06a59..79ce87c 100644
--- a/pkg/policymap/policy_and_data_map.go
+++ b/pkg/policymap/policy_and_data_map.go
@@ -194,11 +194,30 @@ func ExtractDeployedPolicies(policiesMap string) []model.ToscaConceptIdentifier
 	return pdpstatus.Policies
 }
 
+func CheckIfPolicyAlreadyExists(policyId string) bool {
+	if len(LastDeployedPolicies) > 0 {
+		// Unmarshal the last known policies
+		deployedPolicies, err := UnmarshalLastDeployedPolicies(LastDeployedPolicies)
+		if err != nil {
+			log.Warnf("Failed to unmarshal LastDeployedPolicies: %v", err)
+		}
+
+		log.Debugf("deployedPolicies %s", deployedPolicies)
+
+		for _, policy := range deployedPolicies {
+			if policy["policy-id"] == policyId {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func GetTotalDeployedPoliciesCountFromMap() int {
-        deployedPolicies, err := UnmarshalLastDeployedPolicies(LastDeployedPolicies)
-        if err != nil {
-                log.Warnf("Failed to unmarshal LastDeployedPolicies: %v", err)
+	deployedPolicies, err := UnmarshalLastDeployedPolicies(LastDeployedPolicies)
+	if err != nil {
+		log.Warnf("Failed to unmarshal LastDeployedPolicies: %v", err)
 		return 0
-        }
-        return len(deployedPolicies)
+	}
+	return len(deployedPolicies)
 }
diff --git a/pkg/policymap/policy_and_data_map_test.go b/pkg/policymap/policy_and_data_map_test.go
new file mode 100644
index 0000000..f7f4323
--- /dev/null
+++ b/pkg/policymap/policy_and_data_map_test.go
@@ -0,0 +1,237 @@
+// -
+//   ========================LICENSE_START=================================
+//   Copyright (C) 2025: Deutsche Telekom
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//        http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+//   SPDX-License-Identifier: Apache-2.0
+//   ========================LICENSE_END===================================
+
+// will process the update message from pap and send the pdp status response.
+
+package policymap
+
+import (
+	// "encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"policy-opa-pdp/pkg/model"
+)
+
+func TestFormatPolicyAndDataMap(t *testing.T) {
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "test.policy.1", "policy-version": "1.0"},
+	}
+
+	result, err := formatPolicyAndDataMap(deployedPolicies)
+	assert.NoError(t, err)
+	assert.Contains(t, result, `"policy-id": "test.policy.1"`)
+}
+
+func TestFormatMapofAnyType(t *testing.T) {
+	testMap := map[string]string{"key1": "value1"}
+	result, err := FormatMapofAnyType(testMap)
+	assert.NoError(t, err)
+	assert.Contains(t, result, `"key1": "value1"`)
+}
+
+func TestFormatPolicyAndDataMap_EmptyMap(t *testing.T) {
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "test.policy.1", "data": make(chan int)},
+	}
+
+	_, err := formatPolicyAndDataMap(deployedPolicies)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "failed to format json", "Expected JSONformatting error")
+}
+
+func TestUnmarshalLastDeployedPolicies_EmptyString(t *testing.T) {
+	result, err := UnmarshalLastDeployedPolicies("")
+	assert.NoError(t, err)
+	assert.Equal(t, 0, len(result))
+}
+
+func TestUnmarshalLastDeployedPolicies_ValidJSON(t *testing.T) {
+	jsonData := `{"deployed_policies_dict": [{"data": ["role"],"policy": ["role"],"policy-id": "test.policy.1","policy-version": "1.0"}]}`
+	result, err := UnmarshalLastDeployedPolicies(jsonData)
+	assert.NoError(t, err)
+	assert.Equal(t, 1, len(result))
+	assert.Equal(t, "test.policy.1", result[0]["policy-id"])
+}
+
+func TestUpdateDeployedPoliciesinMap(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[]}`
+
+	policy := model.ToscaPolicy{
+		Metadata: model.Metadata{
+			PolicyID:      "new.policy",
+			PolicyVersion: "1.0",
+		},
+		Properties: model.PolicyProperties{
+			Data:   map[string]string{"key1": "value1"},
+			Policy: map[string]string{"rule1": "allow"},
+		},
+	}
+
+	result, err := UpdateDeployedPoliciesinMap(policy)
+	assert.NoError(t, err)
+	assert.Contains(t, result, `"policy-id": "new.policy"`)
+}
+
+func TestUpdateDeployedPoliciesinMap_Negative(t *testing.T) {
+	LastDeployedPolicies = `{deployed_policies_dict:[]}`
+
+	policy := model.ToscaPolicy{
+		Metadata: model.Metadata{
+			PolicyID:      "new.policy",
+			PolicyVersion: "1.0",
+		},
+		Properties: model.PolicyProperties{
+			Data:   map[string]string{"key1": "value1"},
+			Policy: map[string]string{"rule1": "allow"},
+		},
+	}
+
+	result, _ := UpdateDeployedPoliciesinMap(policy)
+	assert.NotContains(t, result, "new.policy canot be added due to invalid json format")
+}
+
+func TestRemoveUndeployedPoliciesfromMap(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[{"policy-id":"test.policy.1","policy-version":"1.0"}]}`
+
+	undeploy := map[string]interface{}{
+		"policy-id":      "test.policy.1",
+		"policy-version": "1.0",
+	}
+
+	result, err := RemoveUndeployedPoliciesfromMap(undeploy)
+	assert.NoError(t, err)
+	assert.NotContains(t, result, `"policy-id": "test.policy.1"`)
+}
+
+func TestRemoveUndeployedPoliciesfromMap_Negative(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[{"policy-id":"test.policy.1"policy-version":"1.0"}]}`
+
+	undeploy := map[string]interface{}{
+		"policy-id":      "test.policy.1",
+		"policy-version": "1.0",
+	}
+
+	result, _ := RemoveUndeployedPoliciesfromMap(undeploy)
+	assert.NotContains(t, result, `"policy-id": "test.policy.1"`)
+}
+
+func TestRemoveUndeployedPolicies_NonExistingPolicyfromMap(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[{"policy-id":"test.policy.1","policy-version":"1.0"}]}`
+
+	undeploy := map[string]interface{}{
+		"policy-id":      "new.policy",
+		"policy-version": "1.0",
+	}
+
+	result, err := RemoveUndeployedPoliciesfromMap(undeploy)
+	assert.NoError(t, err)
+	assert.Contains(t, result, `"policy-id": "test.policy.1"`)
+	assert.NotContains(t, result, `"policy-id": "new.policy"`)
+}
+
+func TestVerifyAndReturnPoliciesToBeDeployed(t *testing.T) {
+	lastDeployedPolicies := `{"deployed_policies_dict":[{"policy-id":"test.policy.1","policy-version":"1.0"}]}`
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{Name: "new.policy", Version: "1.0"},
+		},
+	}
+
+	result := VerifyAndReturnPoliciesToBeDeployed(lastDeployedPolicies, pdpUpdate)
+	assert.Equal(t, 1, len(result))
+	assert.Equal(t, "new.policy", result[0].Name)
+}
+
+func TestVerifyAndReturnPoliciesToBeDeployed_Negative(t *testing.T) {
+	lastDeployedPolicies := `{"deployed_policies_dict":[{"policy-id":"test.policy.1""policy-version":"1.0"}]}`
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{Name: "new.policy", Version: "1.0"},
+		},
+	}
+
+	result := VerifyAndReturnPoliciesToBeDeployed(lastDeployedPolicies, pdpUpdate)
+	assert.NotEqual(t, "new.policy", result)
+}
+
+func TestVerifyAndReturnPoliciesToBeDeployedi_ExistingPolicy(t *testing.T) {
+	lastDeployedPolicies := `{"deployed_policies_dict":[{"policy-id":"test.policy.1","policy-version":"1.0"}]}`
+	pdpUpdate := model.PdpUpdate{
+		PoliciesToBeDeployed: []model.ToscaPolicy{
+			{Name: "test.policy.1", Version: "1.0"},
+		},
+	}
+
+	result := VerifyAndReturnPoliciesToBeDeployed(lastDeployedPolicies, pdpUpdate)
+	assert.Empty(t, result, "Expected result tobe empty as policy is already deployed")
+}
+
+func TestExtractDeployedPolicies(t *testing.T) {
+	policiesMap := `{"deployed_policies_dict":[{"policy-id":"test.policy.1","policy-version":"1.0"}]}`
+
+	result := ExtractDeployedPolicies(policiesMap)
+	assert.Equal(t, 1, len(result))
+	assert.Equal(t, "test.policy.1", result[0].Name)
+}
+
+func TestExtractDeployedPolicies_Negative(t *testing.T) {
+	policiesMap := `{"deployed_policies_dict":[{"policy-id":"test.policy.1","policy-version":1.0"}]}`
+
+	result := ExtractDeployedPolicies(policiesMap)
+	assert.Equal(t, 0, len(result))
+	assert.NotEqual(t, "test.policy.1", result)
+}
+
+func TestExtractDeployedPolicies_MissingPolicyID(t *testing.T) {
+	policiesMap := `{"deployed_policies_dict":[{"policy-id": 123,"policy-version":"1.0"}]}`
+
+	result := ExtractDeployedPolicies(policiesMap)
+	assert.Nil(t, result)
+}
+
+func TestCheckIfPolicyAlreadyExists(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[{"policy-id":"existing.policy","policy-version":"1.0"}]}`
+
+	exists := CheckIfPolicyAlreadyExists("existing.policy")
+	assert.True(t, exists)
+
+	notExists := CheckIfPolicyAlreadyExists("nonexistent.policy")
+	assert.False(t, notExists)
+}
+
+func TestCheckIfPolicyAlreadyExists_JSONParsingFailure(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[{"policy-id":"existing.policy,"policy-version":"1.0"}]}`
+
+	exists := CheckIfPolicyAlreadyExists("existing.policy")
+	assert.False(t, exists)
+}
+
+func TestGetTotalDeployedPoliciesCountFromMap(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[{"policy-id":"test.policy.1","policy-version":"1.0"}]}`
+
+	count := GetTotalDeployedPoliciesCountFromMap()
+	assert.Equal(t, 1, count)
+}
+
+func TestGetTotalDeployedPoliciesCountFromMap_Negative(t *testing.T) {
+	LastDeployedPolicies = `{"deployed_policies_dict":[{"policy-id":test.policy.1","policy-version":"1.0"}]}`
+
+	count := GetTotalDeployedPoliciesCountFromMap()
+	assert.Equal(t, 0, count)
+}
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index 313b9a6..92b715c 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -28,7 +28,17 @@ import (
 	"path/filepath"
 	"policy-opa-pdp/pkg/log"
 	"policy-opa-pdp/pkg/model"
+	"regexp"
 	"strings"
+	"time"
+)
+
+type (
+	CreateDirectoryFunc func(dirPath string) error
+)
+
+var (
+	CreateDirectoryVar CreateDirectoryFunc = CreateDirectory
 )
 
 // validates if the given request is in valid uuid form
@@ -39,7 +49,7 @@ func IsValidUUID(u string) bool {
 
 // Helper function to create a directory if it doesn't exist
 func CreateDirectory(dirPath string) error {
-	err := os.MkdirAll(dirPath, os.ModePerm)
+	err := os.MkdirAll(dirPath, 0750)
 	if err != nil {
 		log.Errorf("Failed to create directory %s: %v", dirPath, err)
 		return err
@@ -133,7 +143,7 @@ func ValidateToscaPolicyJsonFields(policy model.ToscaPolicy) error {
 			}
 			keySeen[key] = true
 			if !strings.HasPrefix(key, "node." + policy.Name) {
-				return fmt.Errorf("data key '%s' does not have name '%s' as a prefix, '%s'", key, policy.Name, emphasize)
+				return fmt.Errorf("data key '%s' does not have name node.'%s' as a prefix, '%s'", key, policy.Name, emphasize)
 			}
 		}
 	}
@@ -187,14 +197,14 @@ func isParentOfExistingPolicy(policyHierarchyLevel, deployedPolicyIDHierarchyLev
 
 	// new policy should have fewer levels than deployed policy to be a parent
 	if len(policyHierarchyLevel) < len(deployedPolicyIDHierarchyLevel) {
-	for policyNameIndex := range policyHierarchyLevel {
-		if policyHierarchyLevel[policyNameIndex] != deployedPolicyIDHierarchyLevel[policyNameIndex] {
-			return false
+		for policyNameIndex := range policyHierarchyLevel {
+			if policyHierarchyLevel[policyNameIndex] != deployedPolicyIDHierarchyLevel[policyNameIndex] {
+				return false
+			}
 		}
-	}
-	return true
+		return true
 
-        }
+	}
 
 	return false
 }
@@ -203,14 +213,84 @@ func isChildOfExistingPolicy(policyHierarchyLevel, deployedPolicyIDHierarchyLeve
 
 	// new policy should have more levels than deployed policy to be a  child
 	if len(policyHierarchyLevel) > len(deployedPolicyIDHierarchyLevel) {
-	for policyNameIndex := range deployedPolicyIDHierarchyLevel {
-		if deployedPolicyIDHierarchyLevel[policyNameIndex] != policyHierarchyLevel[policyNameIndex] {
-			return false
+		for policyNameIndex := range deployedPolicyIDHierarchyLevel {
+			if deployedPolicyIDHierarchyLevel[policyNameIndex] != policyHierarchyLevel[policyNameIndex] {
+				return false
+			}
 		}
-	}
-	return true
+		return true
 
-        }
+	}
 
 	return false
 }
+
+// Custom validation function for time format
+func IsValidTime(t *time.Time) bool {
+	if t == nil {
+		return false
+	}
+	// Format the time in RFC3339 and try parsing it
+	formattedTime := t.Format(time.RFC3339)
+	// Check if the time is a valid date
+	_, err := time.Parse(time.RFC3339, formattedTime)
+	return err == nil
+}
+
+// Custom validation function for time offset format (e.g., '02:00', '-05:00')
+func IsValidTimeOffset(offset *string) bool {
+	if offset == nil || strings.TrimSpace(*offset) == "" {
+		return false
+	}
+	re := regexp.MustCompile(`^[-+]?(0\d|1\d|2[0-3]):[0-5]\d$`) // Format like 02:00, -05:00
+	return re.MatchString(*offset)
+}
+
+// Custom validation function for IANA time zone format (e.g., 'America/New_York')
+func IsValidTimeZone(zone *string) bool {
+	if zone == nil || strings.TrimSpace(*zone) == "" {
+		return false
+	}
+	_, err := time.LoadLocation(*zone) // Check if it's a real timezone
+	if err != nil {
+		return false
+	}
+	re := regexp.MustCompile(`^(?:[A-Za-z]+(?:/[A-Za-z_]+)?|UTC([+-]\d{1,2}:?\d{2})?|[A-Za-z]{3,4})$`) //^(?:[A-Za-z]/[A-Za-z_]|UTC)$`) // Simple check for time zone format like 'America/New_York' or UTC etc
+	return re.MatchString(*zone)
+}
+
+// Custom validation function for data input
+func IsValidData(data *[]map[string]interface{}) bool {
+	if data == nil || len(*data) == 0 {
+		return false
+	} else {
+		return true
+	}
+}
+
+// Custom validation function for CurrentDate
+func IsValidCurrentDate(currentDate *string) bool {
+	if currentDate == nil || strings.TrimSpace(*currentDate) == "" {
+		return false
+	}
+	re := regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`) //  eg: "2025-01-17"
+	return re.MatchString(*currentDate)
+}
+
+// Custom validation function for CurrentTime
+func IsValidCurrentTime(currentTime *string) bool {
+	if currentTime == nil || strings.TrimSpace(*currentTime) == "" {
+		return false
+	}
+	re := regexp.MustCompile(`^\d{2}:\d{2}:\d{2}\.\d{3}Z$`) //eg: 08:26:41.857Z
+	return re.MatchString(*currentTime)
+}
+
+// Custom validation function for *string type eg: OnapComponent, OnapInstance, OnapName, PolicyName
+func IsValidString(name *string) bool {
+	if name == nil || strings.TrimSpace(*name) == "" {
+		return false
+	} else {
+		return true
+	}
+}
diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
index d8d630b..db20148 100644
--- a/pkg/utils/utils_test.go
+++ b/pkg/utils/utils_test.go
@@ -1,6 +1,6 @@
 // -
 //   ========================LICENSE_START=================================
-//   Copyright (C) 2024: Deutsche Telekom
+//   Copyright (C) 2024-2025: Deutsche Telekom
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -20,7 +20,12 @@ package utils
 
 import (
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
+	"os"
+	"path/filepath"
+	"policy-opa-pdp/pkg/model"
 	"testing"
+	"time"
 )
 
 // Positive Test Case: Valid UUIDs
@@ -58,3 +63,525 @@ func TestIsValidUUIDNegative(t *testing.T) {
 		})
 	}
 }
+
+func TestCreateDirectory_Positive(t *testing.T) {
+	tempDir := "testdir"
+	defer os.RemoveAll(tempDir)
+
+	err := CreateDirectory(tempDir)
+	assert.NoError(t, err)
+	assert.DirExists(t, tempDir)
+}
+
+func TestCreateDirectory_Negative(t *testing.T) {
+	err := CreateDirectory("")
+	assert.Error(t, err)
+}
+
+func TestCreateDirectory_InvalidPath(t *testing.T) {
+	tempDir := "/invalid///path"
+	defer os.RemoveAll(tempDir)
+	err := CreateDirectory(tempDir)
+	assert.Error(t, err)
+}
+
+func TestRemoveDirectory_Positive(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "testdir")
+	assert.NoError(t, err)
+
+	filePath := filepath.Join(tempDir, "data.json")
+	file, err := os.Create(filePath)
+	assert.NoError(t, err)
+	file.Close()
+	assert.FileExists(t, filePath, "File should exist before deletion")
+
+	err = RemoveDirectory(tempDir)
+	assert.NoError(t, err)
+	_, err = os.Stat(filePath)
+	assert.True(t, os.IsNotExist(err), "Fle should be removed")
+
+	_, err = os.Stat(tempDir)
+	assert.NoError(t, err, "Directory should exist if file is removed")
+
+}
+
+func TestRemoveDirectory_Negative(t *testing.T) {
+	nonExistentDirectory := filepath.Join(os.TempDir(), "non_existent_directory")
+
+	_, err := os.Stat(nonExistentDirectory)
+	assert.True(t, os.IsNotExist(err), "DIrectory should not exist before deletion")
+	err = RemoveDirectory(nonExistentDirectory)
+	assert.NoError(t, err)
+}
+
+// Test removing a valid empty directory
+func TestRemoveDirectory_ValidEmptyDir(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "testdir")
+	assert.NoError(t, err)
+
+	subDir := filepath.Join(tempDir, "emptysubDir")
+	err = os.Mkdir(subDir, 0777)
+	assert.NoError(t, err)
+	err = RemoveDirectory(tempDir)
+	assert.NoError(t, err, "Expected no error when removing an empty directory")
+
+	_, err = os.Stat(subDir)
+	assert.True(t, os.IsNotExist(err), "Expected directory to be deleted")
+
+	_, err = os.Stat(tempDir)
+	assert.NoError(t, err, "Directory should exist if file is removed")
+}
+
+// Test removing a directory that does not exist
+func TestRemoveDirectory_NonExistent(t *testing.T) {
+	err := RemoveDirectory("/invalid/nonexistent/path")
+	assert.NoError(t, err, "Expected no error when removing a non-existent directory")
+}
+
+// Test failure scenario where ReadDir fails
+func TestRemoveDirectory_ReadDirFailure(t *testing.T) {
+	// Create a file instead of a directory
+	tempFile, err := os.CreateTemp("", "testfile")
+	assert.NoError(t, err)
+	defer os.Remove(tempFile.Name())
+
+	err = RemoveDirectory(tempFile.Name()) // Should fail because it's a file, not a directory
+	assert.Error(t, err, "Expected an error when trying to remove a file as a directory")
+}
+
+// Test removing a directory containing only data.json and policy.rego
+func TestRemoveDirectory_WithSpecificFiles(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "testdir")
+	assert.NoError(t, err)
+	defer os.RemoveAll(tempDir)
+
+	dataFile := tempDir + "/data.json"
+	policyFile := tempDir + "/policy.rego"
+
+	os.WriteFile(dataFile, []byte("test"), 0644)
+	os.WriteFile(policyFile, []byte("test"), 0644)
+
+	err = RemoveDirectory(tempDir)
+	assert.NoError(t, err, "Expected no error when removing specific files")
+
+	_, err = os.Stat(dataFile)
+	assert.True(t, os.IsNotExist(err), "data.json should be deleted")
+
+	_, err = os.Stat(policyFile)
+	assert.True(t, os.IsNotExist(err), "policy.rego should be deleted")
+}
+
+func TestIsDirEmpty_Positive(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "testdir")
+	assert.NoError(t, err)
+
+	defer os.RemoveAll(tempDir)
+	isEmpty, err := isDirEmpty(tempDir)
+	assert.NoError(t, err)
+	assert.True(t, isEmpty)
+}
+
+func TestIsDirEmpty_Negative(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "testdir")
+	assert.NoError(t, err)
+
+	defer os.RemoveAll(tempDir)
+	filePath := filepath.Join(tempDir, "data.json")
+	file, err := os.Create(filePath)
+	assert.NoError(t, err)
+	file.Close()
+	assert.FileExists(t, filePath, "File should exist before deletion")
+
+	isEmpty, err := isDirEmpty(tempDir)
+	assert.NoError(t, err)
+	assert.False(t, isEmpty)
+}
+
+func TestIsDirEmpty_ValidNonEmptyDir(t *testing.T) {
+	tempDir, err := os.MkdirTemp("", "testdir")
+	assert.NoError(t, err, "Expected temp directory to be created")
+	defer os.RemoveAll(tempDir) // Cleanup
+
+	_, err = os.CreateTemp(tempDir, "testfile")
+	assert.NoError(t, err, "Expected test file to be created")
+
+	isEmpty, err := isDirEmpty(tempDir)
+	assert.NoError(t, err, "Expected no error when checking non-empty directory")
+	assert.False(t, isEmpty, "Expected directory to be non-empty")
+}
+
+func TestIsDirEmpty_NonExistentDir(t *testing.T) {
+	fakeDir := "/nonexistent/path"
+
+	isEmpty, err := isDirEmpty(fakeDir)
+	assert.Error(t, err, "Expected error when checking non-existent directory")
+	assert.False(t, isEmpty, "Expected function to return false when directory does not exist")
+}
+
+func TestValidateFIeldsStructs_Positive(t *testing.T) {
+	pdpupdate := model.PdpUpdate{Source: "pap-188b80c3-48de-43b2-a2cc-3d90fbedb373", PdpHeartbeatIntervalMs: 200000, PoliciesToBeDeployed: []model.ToscaPolicy{}, MessageType: "PDP_UPDATE", RequestId: "41e6f35c-35c9-4a64-b35e-cb0f1c5b15cc", TimestampMs: 1739269698262, Name: "opa-241cca97-89df-496f-8d87-2c6d7cd5b6d7", PdpGroup: "opaGroup", PdpSubgroup: "opa"}
+
+	err := ValidateFieldsStructs(pdpupdate)
+	assert.NoError(t, err)
+}
+
+func TestValidateFIeldsStructs_Negative(t *testing.T) {
+	pdpupdate := model.PdpUpdate{Source: "pap-188b80c3-48de-43b2-a2cc-3d90fbedb373", PdpHeartbeatIntervalMs: 200000, PoliciesToBeDeployed: []model.ToscaPolicy{}, MessageType: "PDP_UPDATE", RequestId: "41e6f35c-35c9-4a64-b35e-cb0f1c5b15cc", TimestampMs: 1739269698262, Name: "opa-241cca97-89df-496f-8d87-2c6d7cd5b6d7", PdpGroup: "opaGroup"}
+
+	err := ValidateFieldsStructs(pdpupdate)
+	assert.Error(t, err)
+}
+
+// Positive test cases for IsPolicyNameAllowed
+func TestIsPolicyNameAllowed_Positive(t *testing.T) {
+	policy := model.ToscaPolicy{Name: "policy.test"}
+	deployedPolicies := []map[string]interface{}{{"policy-id": "different.policy"}}
+
+	allowed, err := IsPolicyNameAllowed(policy, deployedPolicies)
+	assert.True(t, allowed)
+	assert.NoError(t, err)
+}
+
+// Negative test cases for IsPolicyNameAllowed (Parent policy exists)
+func TestIsPolicyNameAllowed_Negative(t *testing.T) {
+	policy := model.ToscaPolicy{Name: "policy.test"}
+	deployedPolicies := []map[string]interface{}{{"policy-id": "policy"}}
+
+	allowed, err := IsPolicyNameAllowed(policy, deployedPolicies)
+	assert.False(t, allowed)
+	assert.Error(t, err)
+}
+
+func TestIsPolicyNameAllowed_ParentOfExistingPolicy(t *testing.T) {
+	policy := model.ToscaPolicy{Name: "test.policy"}
+
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "test.policy.1"},
+	}
+
+	allowed, err := IsPolicyNameAllowed(policy, deployedPolicies)
+	assert.Error(t, err)
+	assert.False(t, allowed, "Expected validation to fail due to parent policy conflict")
+	assert.Contains(t, err.Error(), "Policy Validation Failed : Policy-id: test.policy is parent  of deployed policy, overrides existing policy: test.policy.1")
+}
+
+func TestIsPolicyNameAllowed_ChildOfExistingPolicy(t *testing.T) {
+	policy := model.ToscaPolicy{Name: "test.policy.1.1"}
+
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "test.policy.1"},
+	}
+
+	allowed, err := IsPolicyNameAllowed(policy, deployedPolicies)
+	assert.Error(t, err)
+	assert.False(t, allowed, "Expected validation to fail due to child policy conflict")
+	assert.Contains(t, err.Error(), "Policy Validation Failed:  Policy-id: test.policy.1.1 is child  of deployed policy , can overwrite existing policy: test.policy.1")
+}
+
+func TestIsPolicyNameAllowed_NoDeployedPolicies(t *testing.T) {
+	policy := model.ToscaPolicy{Name: "test.policy.1"}
+
+	deployedPolicies := []map[string]interface{}{}
+
+	allowed, err := IsPolicyNameAllowed(policy, deployedPolicies)
+	assert.NoError(t, err)
+	assert.True(t, allowed, "Expected policy name to be allowed when no deployed policies exist")
+}
+
+func TestIsPolicyNameAllowed_EmptyPolicyName(t *testing.T) {
+	policy := model.ToscaPolicy{Name: ""}
+
+	deployedPolicies := []map[string]interface{}{
+		{"policy-id": "test.policy.2"},
+	}
+
+	allowed, err := IsPolicyNameAllowed(policy, deployedPolicies)
+	assert.Error(t, err)
+	assert.False(t, allowed, "Expected policy name validation to fail")
+	assert.Contains(t, err.Error(), "Policy Name cannot be Empty")
+}
+
+// Positive test cases for isParentOfExistingPolicy
+func TestIsParentOfExistingPolicy_Positive(t *testing.T) {
+	parent := []string{"policy"}
+	child := []string{"policy", "test"}
+
+	result := isParentOfExistingPolicy(parent, child)
+	assert.True(t, result)
+}
+
+// Negative test cases for isParentOfExistingPolicy
+func TestIsParentOfExistingPolicy_Negative(t *testing.T) {
+	parent := []string{"policy"}
+	child := []string{"different", "test"}
+
+	result := isParentOfExistingPolicy(parent, child)
+	assert.False(t, result)
+}
+
+// Positive test cases for isChildOfExistingPolicy
+func TestIsChildOfExistingPolicy_Positive(t *testing.T) {
+	parent := []string{"policy"}
+	child := []string{"policy", "test"}
+
+	result := isChildOfExistingPolicy(child, parent)
+	assert.True(t, result)
+}
+
+// Negative test cases for isChildOfExistingPolicy
+func TestIsChildOfExistingPolicy_Negative(t *testing.T) {
+	parent := []string{"policy"}
+	child := []string{"different", "test"}
+
+	result := isChildOfExistingPolicy(child, parent)
+	assert.False(t, result)
+}
+
+// Positive test cases for ValidateToscaPolicyJsonFields
+func TestValidateToscaPolicyJsonFields_Positive(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name:    "test-policy",
+		Version: "1.0",
+		Metadata: model.Metadata{
+			PolicyID:      "test-policy",
+			PolicyVersion: "1.0",
+		},
+		Properties: model.PolicyProperties{
+			Data:   map[string]string{"node.test-policy": "value"},
+			Policy: map[string]string{"test-policy-rule": "some_rule"},
+		},
+	}
+	err := ValidateToscaPolicyJsonFields(policy)
+	assert.NoError(t, err)
+}
+
+// Negative test cases for ValidateToscaPolicyJsonFields
+func TestValidateToscaPolicyJsonFields_Negative(t *testing.T) {
+	invalidPolicy := model.ToscaPolicy{
+		Name:    "wrong-policy",
+		Version: "1.0",
+		Metadata: model.Metadata{
+			PolicyID:      "test-policy",
+			PolicyVersion: "1.0",
+		},
+	}
+	err := ValidateToscaPolicyJsonFields(invalidPolicy)
+	assert.Error(t, err)
+}
+
+func TestValidateToscaPolicyJsonFields_DuplicatePolicy(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name:    "cell.consistency",
+		Version: "1.0",
+		Metadata: model.Metadata{
+			PolicyID:      "cell.consistency",
+			PolicyVersion: "1.0",
+		},
+		Properties: model.PolicyProperties{
+			Data:   map[string]string{"test-policy-key": "value"},
+			Policy: map[string]string{"test-policy-rule": "some_rule"},
+		},
+	}
+
+	policy.Properties.Policy["test-policy-rule"] = "duplicate-key-policy"
+
+	err := ValidateToscaPolicyJsonFields(policy)
+	assert.Error(t, err) // Expect an error due to missing fields
+}
+
+func TestValidateToscaPolicyJsonFields_DuplicateDataKey(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name:    "cell.consistency",
+		Version: "1.0",
+		Metadata: model.Metadata{
+			PolicyID:      "cell.consistency",
+			PolicyVersion: "1.0",
+		},
+		Properties: model.PolicyProperties{
+			Data:   map[string]string{"test-policy-key": "value"},
+			Policy: map[string]string{"test-policy-rule": "some_rule"},
+		},
+	}
+
+	policy.Properties.Data["test-policy-key"] = "duplicatevalue"
+
+	err := ValidateToscaPolicyJsonFields(policy)
+	assert.Error(t, err) // Expect an error due to missing fields
+}
+
+func TestValidateToscaPolicyJsonFields_PolicyKeyName(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name:    "cell.consistency",
+		Version: "1.0",
+		Metadata: model.Metadata{
+			PolicyID:      "cell.consistency",
+			PolicyVersion: "1.0",
+		},
+		Properties: model.PolicyProperties{
+			Data:   map[string]string{"test-policy-key": "value"},
+			Policy: map[string]string{"test-policy-rule": "some_rule"},
+		},
+	}
+
+	err := ValidateToscaPolicyJsonFields(policy)
+	assert.Error(t, err) // Expect an error due to missing fields
+}
+
+func TestValidateToscaPolicyJsonFields_NameMismatch(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name:    "wrong-policy",
+		Version: "1.0",
+		Metadata: model.Metadata{
+			PolicyID:      "test-policy",
+			PolicyVersion: "1.0",
+		},
+	}
+
+	err := ValidateToscaPolicyJsonFields(policy)
+	assert.Error(t, err, "Expected error due to name mismatch")
+	assert.Contains(t, err.Error(), "policy name 'wrong-policy' does not match metadata policy-id 'test-policy'")
+}
+
+func TestValidateToscaPolicyJsonFields_VersionMismatch(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name:    "test-policy",
+		Version: "2.0",
+		Metadata: model.Metadata{
+			PolicyID:      "test-policy",
+			PolicyVersion: "1.0",
+		},
+	}
+
+	err := ValidateToscaPolicyJsonFields(policy)
+	assert.Error(t, err, "Expected error due to version mismatch")
+	assert.Contains(t, err.Error(), "policy version '2.0' does not match metadata policy-version '1.0'")
+}
+
+func TestValidateToscaPolicyJsonFields_InvalidDataKeyPrefix(t *testing.T) {
+	policy := model.ToscaPolicy{
+		Name:    "test-policy",
+		Version: "1.0",
+		Metadata: model.Metadata{
+			PolicyID:      "test-policy",
+			PolicyVersion: "1.0",
+		},
+		Properties: model.PolicyProperties{
+			Data: map[string]string{
+				"invalid-key": "value1",
+			},
+		},
+	}
+
+	err := ValidateToscaPolicyJsonFields(policy)
+	assert.Error(t, err, "Expected error due to invalid data key prefix")
+	assert.Contains(t, err.Error(), "data key 'invalid-key' does not have name node.'test-policy' as a prefix")
+}
+
+func TestIsValidTime(t *testing.T) {
+	now := time.Now()
+	invalidTime := (*time.Time)(nil)
+
+	if !IsValidTime(&now) {
+		t.Errorf("Expected true for valid time")
+	}
+	if IsValidTime(invalidTime) {
+		t.Errorf("Expected false for nil time")
+	}
+}
+
+func TestIsValidTimeOffset(t *testing.T) {
+	validOffsets := []string{"+02:00", "-05:00", "00:00"}
+	invalidOffsets := []string{"25:00", "abc", "12:345", "-123:45", ""}
+
+	for _, offset := range validOffsets {
+		if !IsValidTimeOffset(&offset) {
+			t.Errorf("Expected true for valid offset: %s", offset)
+		}
+	}
+
+	for _, offset := range invalidOffsets {
+		if IsValidTimeOffset(&offset) {
+			t.Errorf("Expected false for invalid offset: %s", offset)
+		}
+	}
+}
+
+func TestIsValidTimeZone(t *testing.T) {
+	validZones := []string{"America/New_York", "UTC", "Europe/London"}
+	invalidZones := []string{"Invalid/Zone", "1234", "New_York/America", " "}
+
+	for _, zone := range validZones {
+		if !IsValidTimeZone(&zone) {
+			t.Errorf("Expected true for valid time zone: %s", zone)
+		}
+	}
+
+	for _, zone := range invalidZones {
+		if IsValidTimeZone(&zone) {
+			t.Errorf("Expected false for invalid time zone: %s", zone)
+		}
+	}
+}
+
+func TestIsValidData(t *testing.T) {
+	validData := []map[string]interface{}{{"key": "value"}}
+	invalidData := []map[string]interface{}{}
+
+	if !IsValidData(&validData) {
+		t.Errorf("Expected true for non-empty data")
+	}
+	if IsValidData(&invalidData) {
+		t.Errorf("Expected false for empty data")
+	}
+}
+
+func TestIsValidCurrentDate(t *testing.T) {
+	validDates := []string{"2025-01-17", "1999-12-31"}
+	invalidDates := []string{"20250117", "01-17-2025", "abcd-ef-gh", ""}
+
+	for _, date := range validDates {
+		if !IsValidCurrentDate(&date) {
+			t.Errorf("Expected true for valid date: %s", date)
+		}
+	}
+
+	for _, date := range invalidDates {
+		if IsValidCurrentDate(&date) {
+			t.Errorf("Expected false for invalid date: %s", date)
+		}
+	}
+}
+
+func TestIsValidCurrentTime(t *testing.T) {
+	validTime := []string{"08:26:41.857Z", "12:35:55.873Z"}
+	invalidTime := []string{"1:2:3:4", "", " "}
+
+	for _, timeval := range validTime {
+		if !IsValidCurrentTime(&timeval) {
+			t.Errorf("Expected true for valid time: %s", timeval)
+		}
+	}
+
+	for _, invalidt := range invalidTime {
+		if IsValidCurrentTime(&invalidt) {
+			t.Errorf("Expected false for invalid time: %s", invalidt)
+		}
+	}
+}
+
+func TestIsValidString(t *testing.T) {
+	validStrings := []string{"test", "example"}
+	invalidStrings := []string{"", " "}
+
+	for _, str := range validStrings {
+		if !IsValidString(&str) {
+			t.Errorf("Expected true for valid string: %s", str)
+		}
+	}
+
+	for _, str := range invalidStrings {
+		if IsValidString(&str) {
+			t.Errorf("Expected false for invalid string: %s", str)
+		}
+	}
+}
author	Shalini Shivam <ss00765416@techmahindra.com>	2025-02-21 14:40:10 +0100
committer	Shalini Shivam <ss00765416@techmahindra.com>	2025-02-25 10:40:58 +0100
commit	7d45fbc19df8adf714deeab1fe267d632c30b411 (patch)
tree	48bce9de5811af3cc612e8ea84956e5473b8aba3
parent	1465593e7293ca7e839b49f353b96111928f14c5 (diff)