Modify python test scripts for bod and sfc scenario.

Change-Id: I2b0eec0a349fbac6130e54db8da33b4caf1b2f2c
Signed-off-by: Xia Yin Ben <xiayinben@huawei.com>

diff --git a/nemo-impl/src/test/resources/bod-1.py b/nemo-impl/src/test/resources/bod-1.py
index 0536aabf4545d4aacf37728f9c14c198a04fa7b7..f626a17a4219566b819580906f0ec08d6073e686 100644 (file)
--- a/nemo-impl/src/test/resources/bod-1.py
+++ b/nemo-impl/src/test/resources/bod-1.py
@@ -26,10 +26,7 @@ def register_user(contHost):
 def transaction_begin(contHost):
        data={
                        "input":{
-                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b",
-                                       "user-name":"user2",
-                                       "user-password":"abc",
-                                       "user-role":"tenant"
+                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b"                                        
                                        }
                }
        post(TRANSACTION_BEGIN % contHost, data)
@@ -37,20 +34,14 @@ def transaction_begin(contHost):
 def transaction_end(contHost):
        data={
                        "input":{
-                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b",
-                                       "user-name":"user2",
-                                       "user-password":"abc",
-                                       "user-role":"tenant"
+                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b"                                
                                        }
                }
        post(TRANSACTION_END % contHost, data)
 
 def add_server1_host(contHost):
        data={
-                       "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
+                       "input":{                               
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -68,9 +59,6 @@ def add_server1_host(contHost):
 def add_server2_host(contHost):
        data={
                        "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -88,9 +76,6 @@ def add_server2_host(contHost):
 def add_vm1_host(contHost):
        data={
                        "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -108,9 +93,6 @@ def add_vm1_host(contHost):
 def add_vm2_host(contHost):
        data={
                        "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -128,9 +110,6 @@ def add_vm2_host(contHost):
 def add_enterpise_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -194,9 +173,6 @@ def add_enterpise_node(contHost):
 def add_internet_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -261,9 +237,6 @@ def add_internet_node(contHost):
 def add_dmz_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -322,9 +295,6 @@ def add_dmz_node(contHost):
 def add_interior_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -391,9 +361,6 @@ def add_interior_node(contHost):
 def add_enterprise_interior_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [
@@ -434,9 +401,6 @@ def add_enterprise_interior_connection(contHost):
 def add_interior_dmz_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [
@@ -464,9 +428,6 @@ def add_interior_dmz_connection(contHost):
 def add_dmz_internet_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [
@@ -494,9 +455,6 @@ def add_dmz_internet_connection(contHost):
 def update_enterprise_interior_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [

diff --git a/nemo-impl/src/test/resources/bod-2.py b/nemo-impl/src/test/resources/bod-2.py
index e480016e8cdcfe8852dcc83fda56ef3f30140827..86c4bf98258fa6045aa2072658dda9eea54bcead 100644 (file)
--- a/nemo-impl/src/test/resources/bod-2.py
+++ b/nemo-impl/src/test/resources/bod-2.py
@@ -26,10 +26,7 @@ def register_user(contHost):
 def transaction_begin(contHost):
        data={
                        "input":{
-                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b",
-                                       "user-name":"user2",
-                                       "user-password":"abc",
-                                       "user-role":"tenant"
+                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b"
                                        }
                }
        post(TRANSACTION_BEGIN % contHost, data)
@@ -37,10 +34,7 @@ def transaction_begin(contHost):
 def transaction_end(contHost):
        data={
                        "input":{
-                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b",
-                                       "user-name":"user2",
-                                       "user-password":"abc",
-                                       "user-role":"tenant"
+                                       "user-id":"14ce424a-3e50-4a2a-ad5c-b29845158c8b"                                
                                        }
                }
        post(TRANSACTION_END % contHost, data)
@@ -48,9 +42,6 @@ def transaction_end(contHost):
 def add_server1_host(contHost):
        data={
                        "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -68,9 +59,6 @@ def add_server1_host(contHost):
 def add_server2_host(contHost):
        data={
                        "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -88,9 +76,6 @@ def add_server2_host(contHost):
 def add_vm1_host(contHost):
        data={
                        "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -108,9 +93,6 @@ def add_vm1_host(contHost):
 def add_vm2_host(contHost):
        data={
                        "input":{
-                                "user-name": "user2",
-                                 "user-role": "tenant",
-                                 "user-password": "abc",
                                  "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                                  "objects":{
                                                "node":[
@@ -128,9 +110,6 @@ def add_vm2_host(contHost):
 def add_enterpise_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -194,9 +173,6 @@ def add_enterpise_node(contHost):
 def add_internet_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -261,9 +237,6 @@ def add_internet_node(contHost):
 def add_dmz_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -322,9 +295,6 @@ def add_dmz_node(contHost):
 def add_interior_node(contHost):
        data={
                  "input":{
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                          "node":[
@@ -391,9 +361,6 @@ def add_interior_node(contHost):
 def add_enterprise_interior_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [
@@ -434,9 +401,6 @@ def add_enterprise_interior_connection(contHost):
 def add_interior_dmz_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [
@@ -464,9 +428,6 @@ def add_interior_dmz_connection(contHost):
 def add_dmz_internet_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [
@@ -494,9 +455,6 @@ def add_dmz_internet_connection(contHost):
 def update_enterprise_interior_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user2",
-                         "user-role": "tenant",
-                         "user-password": "abc",
                          "user-id": "14ce424a-3e50-4a2a-ad5c-b29845158c8b",
                          "objects":{
                                  "connection": [

diff --git a/nemo-impl/src/test/resources/servicechain.py b/nemo-impl/src/test/resources/servicechain.py
index b684b37f2597d3979217d163b78cf7ef36249fb1..5c78f8253d2910d8d1da994e381453d601f16748 100644 (file)
--- a/nemo-impl/src/test/resources/servicechain.py
+++ b/nemo-impl/src/test/resources/servicechain.py
@@ -26,10 +26,7 @@ def register_user(contHost):
 def transaction_begin(contHost):
        data={
                        "input":{
-                                       "user-id":"af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
-                                       "user-name":"user1",
-                                       "user-password":"abcd",
-                                       "user-role":"tenant"
+                                       "user-id":"af4fc2be-e3f4-4388-a8ef-3aabae872f2b"
                                        }
                }
        post(TRANSACTION_BEGIN % contHost, data)
@@ -37,10 +34,7 @@ def transaction_begin(contHost):
 def transaction_end(contHost):
        data={
                        "input":{
-                                       "user-id":"af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
-                                       "user-name":"user1",
-                                       "user-password":"abcd",
-                                       "user-role":"tenant"
+                                       "user-id":"af4fc2be-e3f4-4388-a8ef-3aabae872f2b"
                                        }
                }
        post(TRANSACTION_END % contHost, data)
@@ -49,9 +43,6 @@ def transaction_end(contHost):
 def add_headquarter_node(contHost):
        data={
                  "input":{
-                         "user-name": "user1",
-                         "user-role": "tenant",
-                         "user-password": "abcd",
                          "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                          "objects":{
                          "node":[
@@ -115,9 +106,6 @@ def add_headquarter_node(contHost):
 def add_site_node(contHost):
        data={
                          "input":{
-                             "user-name": "user1",
-                                 "user-role": "tenant",
-                                 "user-password": "abcd",
                                  "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                                  "objects":{
                                  "node":[
@@ -181,9 +169,6 @@ def add_site_node(contHost):
 def add_firewall_node(contHost):
        data={
                          "input":{
-                             "user-name": "user1",
-                                 "user-role": "tenant",
-                                 "user-password": "abcd",
                                  "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                                  "objects":{
                                  "node":[
@@ -225,9 +210,6 @@ def add_firewall_node(contHost):
 def add_cache_node(contHost):
        data={
                          "input":{
-                             "user-name": "user1",
-                                 "user-role": "tenant",
-                                 "user-password": "abcd",
                                  "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                                  "objects":{
                                  "node":[
@@ -269,9 +251,6 @@ def add_cache_node(contHost):
 def add_chain_node(contHost):
        data={
                  "input":{
-                     "user-name": "user1",
-                         "user-role": "tenant",
-                         "user-password": "abcd",
                          "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                          "objects":{
                          "node":[
@@ -298,9 +277,6 @@ def add_chain_node(contHost):
 def add_head_site_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user1",
-                         "user-role": "tenant",
-                         "user-password": "abcd",
                          "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                          "objects":{
                                  "connection": [
@@ -328,9 +304,6 @@ def add_head_site_connection(contHost):
 def add_head_chain_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user1",
-                         "user-role": "tenant",
-                         "user-password": "abcd",
                          "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                          "objects":{
                                  "connection": [
@@ -358,9 +331,6 @@ def add_head_chain_connection(contHost):
 def add_site_chain_connection(contHost):
        data={
                 "input": {
-                         "user-name": "user1",
-                         "user-role": "tenant",
-                         "user-password": "abcd",
                          "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                          "objects":{
                                  "connection": [
@@ -388,9 +358,6 @@ def add_site_chain_connection(contHost):
 def add_flow(contHost):
        data={
                 "input": {
-                         "user-name": "user1",
-                         "user-role": "tenant",
-                         "user-password": "abcd",
                          "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                          "objects":{
                                  "flow": [
@@ -421,9 +388,6 @@ def add_flow(contHost):
 def add_operation(contHost):
        data={
                 "input": {
-                         "user-name": "user1",
-                         "user-role": "tenant",
-                         "user-password": "abcd",
                          "user-id": "af4fc2be-e3f4-4388-a8ef-3aabae872f2b",
                          "operations":{
                                  "operation": [