RFC-8040 migration

Updates to migrate from Biermann draft version of RESTCONF
to RFC 8040 version

Issue-ID: SDNC-1847
Change-Id: I1837fc3613274aa0725f2d170e9346d402189f57
Signed-off-by: Dan Timoney <dtimoney@att.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/admportal/server/router/routes/odl.js b/admportal/server/router/routes/odl.js
index 3882afcc..2dfee4a1 100644
--- a/admportal/server/router/routes/odl.js
+++ b/admportal/server/router/routes/odl.js
@@ -44,7 +44,7 @@ function handleResult(err, response_str, res) {
 // calls restconf to get information
 router.get('/listWklst', csp.checkAuth, function(req, res) {
     options.strictSSL = true;   // used to test SSL certificate
-    OdlInterface.Get('/restconf/config/L3SDN-API:services',options, handleResult,req,res);
+    OdlInterface.Get('/rests/data/L3SDN-API:services?content=config',options, handleResult,req,res);
 });
 
 router.get('/pageWklst', csp.checkAuth, function(req,res) {
@@ -102,9 +102,9 @@ router.post('/update_vr_lan_interface', function(req,res){
 	};
 	var tasks = [];
 	tasks.push(function(callback){
-		OdlInterface.put_vr_lan_interface('/restconf/config/L3SDN-API:services/layer3-service-list/'
+		OdlInterface.put_vr_lan_interface('/rests/data/L3SDN-API:services/layer3-service-list='
 			+ svc_instance_id
-			+ '/service-data/vr-lan/', options, callback);
+			+ '/service-data/vr-lan?content=config', options, callback);
 	});
 	async.series(tasks, function(err,result){
 		
diff --git a/admportal/server/router/routes/root.js b/admportal/server/router/routes/root.js
index 78b69829..ff20a837 100644
--- a/admportal/server/router/routes/root.js
+++ b/admportal/server/router/routes/root.js
@@ -34,13 +34,13 @@ router.get('/test', function(req,res){
 	var header = {'Host': host, 'Authorization': auth, 'Content-Type': 'application/yang.data+json'};
 	var c_header = {'Host': properties.odlConexusHost, 'Authorization': auth, 'Content-Type': 'application/yang.data+json'};
 
-// path = '/restconf/config/SLI-API:healthcheck',
+// path = '/rests/operations/SLI-API:healthcheck',
 	var _options = {
 		method			  : 'POST',
         host              : host,
         headers           : header,
         port              : '8443',
-		path			  : '/restconf/operations/SLI-API:healthcheck',
+		path			  : '/rests/operations/SLI-API:healthcheck',
         rejectUnauthorized: false,
         strictSSL         : false
 	};
@@ -49,7 +49,7 @@ router.get('/test', function(req,res){
         host              : properties.odlConexusHost,
         headers           : c_header,
         port              : '8543',
-		path			  : '/restconf/operations/SLI-API:healthcheck',
+		path			  : '/rests/operations/SLI-API:healthcheck',
         rejectUnauthorized: false,
         strictSSL         : false
 	};