commit 9acc883eeee4c12ed1f3f538770e9c34f3e72862
author Suchitra Vemuri <suchitra@onlab.us> Tue May 30 15:39:39 2017 -0700
committer Suchitra Vemuri <suchitra@onlab.us> Tue May 30 15:39:39 2017 -0700
tree b74a690cde8e94308b9045616ecefb19877b3613
parent 11cb0a91ab55d6b259cc1fe2fb88b9ba84844182

Fix some issues with Chameleon Tests

Change-Id: I833667365fe4781589b4cea62901f6fcce47fe4a

src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt

diff --git a/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt b/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt
index c814b94..3676c39 100644
--- a/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt
+++ b/src/test/cord-api/Tests/Ch_SubscriberVolt_Delete.txt
@@ -48,10 +48,11 @@
     Log    ${subscriberDict}
     ${subscriberId}=    utils.getFieldValueFromDict    ${subscriberDict}    id
     Log    ${subscriberId}
-    ${subscriber_delete_result}=    restApi.ApiChameleonDelete    VOLT_SUBSCRIBER    ${subscriberId}
-    Should Be True    ${subscriber_delete_result}
     # Deletion of volt Tenants
     ${getVoltDict}=    utils.getDictFromListOfDict    ${getVoltTenant_result_list}    subscriber_root_id    ${subscriberId}
     ${voltID}=    utils.getFieldValueFromDict    ${getVoltDict}    id
     ${volt_delete_result}=    restApi.ApiChameleonDelete    VOLT_TENANT    ${voltID}
     Should Be True    ${volt_delete_result}
+    #Deletion of Subscribers
+    ${subscriber_delete_result}=    restApi.ApiChameleonDelete    VOLT_SUBSCRIBER    ${subscriberId}
+    Should Be True    ${subscriber_delete_result}

src/test/cord-api/Tests/Ch_VoltTenant.txt

diff --git a/src/test/cord-api/Tests/Ch_VoltTenant.txt b/src/test/cord-api/Tests/Ch_VoltTenant.txt
index 60b4a41..e773db9 100644
--- a/src/test/cord-api/Tests/Ch_VoltTenant.txt
+++ b/src/test/cord-api/Tests/Ch_VoltTenant.txt
@@ -64,6 +64,6 @@
     # Verifying Get after PUT operation
     #${getVolt_afterPut}=    restApi.ApiGet    VOLT_TENANT
     #${getVoltDict}=    utils.getDictFromListofDict    ${getVolt_afterPut}    id    ${voltID}
-    ${getVoltDict}=    utils.ApiChemeleonGet    VOLT_TENANT    ${voltID}
+    ${getVoltDict}=    restApi.ApiChameleonGet    VOLT_TENANT    ${voltID}
     ${result_afterPut}=    utils.compare_dict    ${putvoltTenantDict}    ${getVoltDict}
     Should Be True    ${result_afterPut}

src/test/cord-api/Tests/data/Ch_VoltTenant.json

diff --git a/src/test/cord-api/Tests/data/Ch_VoltTenant.json b/src/test/cord-api/Tests/data/Ch_VoltTenant.json
index 305ba90..a42e5c3 100644
--- a/src/test/cord-api/Tests/data/Ch_VoltTenant.json
+++ b/src/test/cord-api/Tests/data/Ch_VoltTenant.json
@@ -12,8 +12,8 @@
     {
      "voltTenant" : 
       {
-        "s_tag" : "121",
-        "c_tag" : "333",
+        "s_tag" : 121,
+        "c_tag" : 333,
         "subscriber_root_id" : ""
       },
       "service_specific_id" : "305"
@@ -21,8 +21,8 @@
     {
      "voltTenant" :
       {
-        "s_tag" : "131",
-        "c_tag" : "444",
+        "s_tag" : 131,
+        "c_tag" : 444,
         "subscriber_root_id" : ""
       },
      "service_specific_id" : "306"

src/test/cord-api/Tests/data/Ch_putVoltTenant.json

diff --git a/src/test/cord-api/Tests/data/Ch_putVoltTenant.json b/src/test/cord-api/Tests/data/Ch_putVoltTenant.json
index d3f4440..912e4f0 100644
--- a/src/test/cord-api/Tests/data/Ch_putVoltTenant.json
+++ b/src/test/cord-api/Tests/data/Ch_putVoltTenant.json
@@ -11,16 +11,16 @@
     {
      "voltTenant" : 
       {
-        "s_tag" : "112",
-        "c_tag" : "331"
+        "s_tag" : 112,
+        "c_tag" : 331
       },
       "service_specific_id" : "305"
     },
     {
      "voltTenant" :
       {
-        "s_tag" : "112",
-        "c_tag" : "442"
+        "s_tag" : 112,
+        "c_tag" : 442
       },
       "service_specific_id" : "306"
     }