X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FSettingsLibrary.py;h=c0325d334f40ec611abae63847b935bc46da5fd6;hb=HEAD;hp=e47c420707a3fc9c6feed7a99273fce5dded08ec;hpb=59e81c38620fa1b61e15771191e35771450b9499;p=integration%2Ftest.git

diff --git a/csit/libraries/SettingsLibrary.py b/csit/libraries/SettingsLibrary.py
index e47c420707..c0325d334f 100644
--- a/csit/libraries/SettingsLibrary.py
+++ b/csit/libraries/SettingsLibrary.py
@@ -1,14 +1,15 @@
-__author__ = "Basheeruddin Ahmed"
-__copyright__ = "Copyright(c) 2014, Cisco Systems, Inc."
-__license__ = "New-style BSD"
-__email__ = "syedbahm@cisco.com"
-
 from string import Template
 
 # helps in taking the hostname entered by the user
 # global hostname
 # global port
 
+__author__ = "Basheeruddin Ahmed"
+__copyright__ = "Copyright(c) 2014, Cisco Systems, Inc."
+__license__ = "New-style BSD"
+__email__ = "syedbahm@cisco.com"
+
+
 # def setHostname(host):
 #     hostname=host
 
@@ -18,54 +19,62 @@ from string import Template
 
 def getCarsUrl(hostname, port):
     """Cars resource URL for GET"""
-    return "http://" + hostname + ":" + port + "/restconf/config/car:cars"
+    return "http://" + hostname + ":" + port + "/rests/data/car:cars"
 
 
 def getPersonsUrl(hostname, port):
     """People resouce URL for GET"""
-    return "http://" + hostname + ":" + port + "/restconf/config/people:people"
+    return "http://" + hostname + ":" + port + "/rests/data/people:people"
 
 
 def getCarPersonUrl(hostname, port):
     """GET cars persons mapping resource URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config/car-people:car-people"
+    return "http://" + hostname + ":" + port + "/rests/data/car-people:car-people"
 
 
 def getAddCarInitUrl(hostname, port):
     """POST or DELETE URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config"
+    return "http://" + hostname + ":" + port + "/rests/data"
 
 
 def getAddCarUrl(hostname, port):
     """POST or DELETE URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config/car:cars"
+    return "http://" + hostname + ":" + port + "/rests/data/car:cars"
 
 
 def getAddPersonUrl(hostname, port):
     """POST or DELETE URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config"
+    return "http://" + hostname + ":" + port + "/rests/data"
 
 
 def getAddPersonRpcUrl(hostname, port):
     """POST URL -using rpc"""
-    return "http://" + hostname + ":" + port + "/restconf/operations/people:add-person"
+    return "http://" + hostname + ":" + port + "/rests/operations/people:add-person"
 
 
 def getAddCarPersonUrl(hostname, port):
     """POST URL for car person mapping"""
-    return "http://" + hostname + ":" + port + "/restconf/config"
+    return "http://" + hostname + ":" + port + "/rests/data"
 
 
 def getBuyCarRpcUrl(hostname, port):
     """POST URL for buy car rpc"""
-    return "http://" + hostname + ":" + port + "/restconf/operations/car-purchase:buy-car"
+    return "http://" + hostname + ":" + port + "/rests/operations/car-purchase:buy-car"
 
 
 def getJolokiaURL(hostname, port, shardIndex, shardName):
     """GET URL for jolokia"""
-    return "http://" + hostname + ":" + port + \
-        "/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-" + \
-        shardIndex + "-" + shardName + ",type=DistributedConfigDatastore"
+    return (
+        "http://"
+        + hostname
+        + ":"
+        + port
+        + "/jolokia/read/org.opendaylight.controller:Category=Shards,name=member-"
+        + shardIndex
+        + "-"
+        + shardName
+        + ",type=DistributedConfigDatastore"
+    )
 
 
 # Template for Car init resource payload
@@ -82,7 +91,8 @@ add_car_init_payload_template = Template(
             }
         ]
     }}
-    """)
+    """
+)
 
 # Template for Car resource payload
 add_car_payload_template = Template(
@@ -97,7 +107,8 @@ add_car_payload_template = Template(
             }
         ]
     }
-    """)
+    """
+)
 
 # Template for Person resource payload
 add_person_payload_template = Template(
@@ -113,7 +124,8 @@ add_person_payload_template = Template(
             }
         ]
     }}
-    """)
+    """
+)
 
 # Template for Car Person mapping  payload
 add_car_person_template = Template(
@@ -126,7 +138,8 @@ add_car_person_template = Template(
             }
         ]
     }}
-    """)
+    """
+)
 
 # Template for adding person using RPC
 add_person_rpc_payload_template = Template(
@@ -141,7 +154,8 @@ add_person_rpc_payload_template = Template(
                 "people:age":"$age"
             }
     }
-    """)
+    """
+)
 
 # Template for buing car rpc
 buy_car_rpc_template = Template(
@@ -154,4 +168,5 @@ buy_car_rpc_template = Template(
             "car-purchase:car-id" : "$carId"
         }
     }
-    """)
+    """
+)