Attempt to check CSIT
Consul and CBS discovery fix
Change-Id: I0e3ded421b9f285c28a3b5307138adcdec022cca
Issue-ID: INT-989
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
index 45c71dc..aca9d6a 100644
--- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
+++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
@@ -60,6 +60,7 @@
command: ["agent", "-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
volumes:
- ./consul.d/:/consul/consul.d
+ container_name: consul
consul-cfg:
image: consul:1.0.6
@@ -145,6 +146,7 @@
}
}'
]
+ container_name: consul-cfg
depends_on:
- consul
@@ -156,3 +158,4 @@
- CONSUL_HOST
depends_on:
- consul-cfg
+ container_name: cbs
\ No newline at end of file
diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index c231185..9b7e783 100644
--- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot
+++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
@@ -30,15 +30,18 @@
#Wait Until Keyword Succeeds 100x 100ms Check PRH log ${notification}
Valid event processing
- [Arguments] ${input_valid__ves_event_in_dmaap}
+ [Arguments] ${input_valid__ves_event_in_dmaap} ${input_aai}
[Timeout] 30s
${data}= Get Data From File ${input_valid__ves_event_in_dmaap}
+ ${aai_entry_to_be_set}= Get Data From File ${input_aai}
Set event in DMaaP ${data}
${pnf_name}= Create PNF name ${data}
Set PNF name in AAI ${pnf_name}
+ Set PNF content in AAI ${aai_entry_to_be_set}
${expected_event_pnf_ready_in_dpaap}= create pnf ready_notification as pnf ready ${data}
#TODO to fix after CBS merge
- #Wait Until Keyword Succeeds 100x 300ms Check PNF_READY notification ${expected_event_pnf_ready_in_dpaap}
+ #Wait Until Keyword Succeeds 10x 300ms Check PNF_READY notification ${expected_event_pnf_ready_in_dpaap}
+ #Wait Until Keyword Succeeds 10x 5000ms Check PRH log Mandingo
Check PRH log
[Arguments] ${searched_log}
@@ -59,6 +62,15 @@
${resp}= Put Request ${aai_setup_session} /set_pnf headers=${headers} data=${pnf_name}
Should Be Equal As Strings ${resp.status_code} 200
+Set PNF content in AAI
+ [Arguments] ${aai_pnf_content}
+ ${headers}= Create Dictionary Accept=application/json Content-Type=text/html
+ Log AAI url ${AAI_SIMULATOR_SETUP_URL}
+ Log Http headers ${headers}
+ Log PNF AAI content ${aai_pnf_content}
+ ${resp}= Put Request ${aai_setup_session} /setup/add_pnf_entry headers=${headers} data=${aai_pnf_content}
+ Should Be Equal As Strings ${resp.status_code} 200
+
Set event in DMaaP
[Arguments] ${event_in_dmaap}
${resp}= Put Request ${dmaap_setup_session} /set_get_event headers=${suite_headers} data=${event_in_dmaap}