Issue-ID: DCAEGEN2-1055 BBS test bug fixes

Change-Id: I43314e5e81027cfd4deef71a183d19fad4248626
Signed-off-by: s00370346 <swarup.nayak1@huawei.com>

2 files changed, 23 insertions, 1 deletions

diff --git a/etc/collector.properties b/etc/collector.properties
index 3bee48e..1cca357 100755
--- a/etc/collector.properties
+++ b/etc/collector.properties
@@ -70,7 +70,7 @@ collector.rcc.inputQueue.maxPending=8096
 ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile

 collector.rcc.dmaap.streamid=notification=device-registration

 collector.dmaapfile=./etc/DmaapConfig.json 

-rcc_policy = [{\"controller_name\":\"AccessM&C\",\"controller_restapiUrl\":\"10.118.191.43:26335\",\"controller_restapiUser\":\"access\",\"controller_restapiPassword\":\"Huawei@123\",\"controller_accessTokenUrl\":\"/rest/plat/smapp/v1/oauth/token\",\"controller_accessTokenFile\":\"./etc/access-token.json\",\"controller_accessTokenMethod\":\"put\",\"controller_subsMethod\":\"post\",\"controller_subscriptionUrl\":\"/restconf/v1/operations/huawei-nce-notification-action:establish-subscription\",\"event_details\":[{\"event_name\":\"ONT_registration\",\"event_description\":\"ONTregistartionevent\",\"event_sseventUrlEmbed\":\"true\",\"event_sseventsField\":\"output.url\",\"event_sseventsUrl\":\"null\",\"event_subscriptionTemplate\":\"./etc/ont_registartion_subscription_template.json\",\"event_unSubscriptionTemplate\":\"./etc/ont_registartion_unsubscription_template.json\",\"event_ruleId\":\"777777777\"}]}]

+rcc_policy = [{\"controller_name\":\"AccessM&C\",\"controller_restapiUrl\":\"10.118.191.43:26335\",\"controller_restapiUser\":\"access\",\"controller_restapiPassword\":\"Huawei@123\",\"controller_accessTokenUrl\":\"/rest/plat/smapp/v1/oauth/token\",\"controller_accessTokenFile\":\"./etc/access-token.json\",\"controller_accessTokenMethod\":\"put\",\"controller_subsMethod\":\"post\",\"controller_subscriptionUrl\":\"/restconf/v1/operations/huawei-nce-notification-action:establish-subscription\",\"event_details\":[{\"event_name\":\"ONT_registration\",\"event_description\":\"ONTregistartionevent\",\"event_sseventUrlEmbed\":\"true\",\"event_sseventsField\":\"output.url\",\"event_sseventsUrl\":\"null\",\"event_subscriptionTemplate\":\"./etc/ont_registartion_subscription_template.json\",\"event_unSubscriptionTemplate\":\"./etc/ont_registartion_unsubscription_template.json\",\"event_ruleId\":\"777777777\", \"modifyData\": \"true\", \"modifyMethod\": \"modifyOntEvent\"}]}]

 

 # Describes at what frequency (measured in minutes) should application try to fetch config from CBS

 

@@ -88,3 +88,6 @@ collector.keystore.file.location=etc/keystore
 collector.keystore.passwordfile=etc/rcc_passwordfile

 collector.rcc.keystore.alias=tomcat

 collector.rcc.service.secure.clientauth=0

+

+

+collector.eventinfo=etc/ont_config.json
\ No newline at end of file
diff --git a/etc/ont_config.json b/etc/ont_config.json
new file mode 100644
index 0000000..68a2fa0
--- /dev/null
+++ b/etc/ont_config.json
@@ -0,0 +1,19 @@
+{
+  "lastServiceDate" : "",
+  "macAddress" : "54:04:a6:38:12:9d",
+  "manufactureDate" : "",
+  "modelNumber": "",
+  "oamV4IpAddress": "",
+  "oamV6IpAddress": "",
+  "serialNumber": "",
+  "softwareVersion": "",
+  "unitFamily": "",
+  "unitType": "",
+  "vendorName": "Huawei",
+  "additionalFields" : {
+    "attachment-point": "",
+    "svlan": "100",
+    "cvlan": "10",
+    "remote-id": "AC9.0234.0337"
+  }
+}
\ No newline at end of file