diff --git a/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiContextHandler.java b/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiContextHandler.java
index 68e3978..be0c874 100644
--- a/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiContextHandler.java
+++ b/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiContextHandler.java
@@ -23,7 +23,7 @@
 import org.onosproject.yang.gen.v1.tapicommon.rev20181016.tapicommon.Uuid;
 import org.onosproject.yang.gen.v1.tapiconnectivity.rev20181016.tapiconnectivity.connectivitycontext.DefaultConnectivityService;
 import org.onosproject.yang.gen.v1.tapiconnectivity.rev20181016.tapiconnectivity.context.DefaultAugmentedTapiCommonContext;
-import org.onosproject.yang.gen.v1.tapitopology.rev20181016.tapitopology.topologycontext.DefaultTopology;
+import org.onosproject.yang.gen.v1.tapitopology.rev20181016.tapitopology.context.augmentedtapicommoncontext.DefaultTopologyContext;
 import org.onosproject.yang.model.DefaultModelObjectData;
 import org.onosproject.yang.model.ModelObjectData;
 import org.onosproject.yang.model.ModelObjectId;
@@ -64,7 +64,7 @@
                 .addChild(DefaultContext.class)
                 .build();
 
-        DefaultTopology mObj = new DefaultTopology();
+        DefaultTopologyContext mObj = new DefaultTopologyContext();
 
         return DefaultModelObjectData.builder()
                 .addModelObject(mObj)
diff --git a/apps/odtn/service/src/test/resources/post-tapi-rpc-create-connectivity-service b/apps/odtn/service/src/test/resources/post-tapi-rpc-create-connectivity-service
index 8f3409d..9d97e52 100644
--- a/apps/odtn/service/src/test/resources/post-tapi-rpc-create-connectivity-service
+++ b/apps/odtn/service/src/test/resources/post-tapi-rpc-create-connectivity-service
@@ -1 +1 @@
-curl -X POST http://localhost:8181/onos/restconf/operations/tapi-connectivity:create-connectivity-service -H 'cache-control: no-cache' -H 'content-type: application/json' -H 'Basic a2FyYWY6a2FyYWY=' -d @create-connectivity.json
+curl -X POST http://localhost:8181/onos/restconf/operations/tapi-connectivity:create-connectivity-service -H 'cache-control: no-cache' -H 'content-type: application/json' --user onos:rocks -d @create-connectivity.json
diff --git a/apps/odtn/service/src/test/resources/post-tapi-rpc-delete-connectivity-service b/apps/odtn/service/src/test/resources/post-tapi-rpc-delete-connectivity-service
index b45296e..65f97b4 100644
--- a/apps/odtn/service/src/test/resources/post-tapi-rpc-delete-connectivity-service
+++ b/apps/odtn/service/src/test/resources/post-tapi-rpc-delete-connectivity-service
@@ -1 +1 @@
-curl -X POST http://localhost:8181/onos/restconf/operations/tapi-connectivity:delete-connectivity-service -H 'cache-control: no-cache' -H 'content-type: application/json' -H 'Basic a2FyYWY6a2FyYWY=' -d @delete-connectivity.json
+curl -X POST http://localhost:8181/onos/restconf/operations/tapi-connectivity:delete-connectivity-service -H 'cache-control: no-cache' -H 'content-type: application/json' --user onos:rocks -d @delete-connectivity.json
diff --git a/apps/odtn/service/src/test/resources/post-tapi-rpc-get-connectivity b/apps/odtn/service/src/test/resources/post-tapi-rpc-get-connectivity
new file mode 100644
index 0000000..e6a8a27
--- /dev/null
+++ b/apps/odtn/service/src/test/resources/post-tapi-rpc-get-connectivity
@@ -0,0 +1 @@
+curl -X POST http://localhost:8181/onos/restconf/operations/tapi-connectivity:get-connectivity-service-list -H 'cache-control: no-cache' -H 'content-type: application/json' --user onos:rocks -d '{}'
\ No newline at end of file
diff --git a/apps/odtn/service/src/test/resources/post-tapi-rpc-get-service-interface-point-list b/apps/odtn/service/src/test/resources/post-tapi-rpc-get-service-interface-point-list
new file mode 100644
index 0000000..eb350dd
--- /dev/null
+++ b/apps/odtn/service/src/test/resources/post-tapi-rpc-get-service-interface-point-list
@@ -0,0 +1 @@
+curl -X POST http://localhost:8181/onos/restconf/operations/tapi-common:get-service-interface-point-list -H 'cache-control: no-cache' -H 'content-type: application/json' --user onos:rocks -d '{}'
\ No newline at end of file