commit 6594b75d674957f0ad494d39361bfc462d405368
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Tue Dec 13 00:31:13 2016 +0000
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Thu Dec 22 17:27:30 2016 -0800
tree 9a70aba82f0f7f8a14962ff58ca46a6e43e041a2
parent af2cd4f5bb9a12d1866bb7818e4634e3ea314312

Added validation of monitoring service after instantiation process

Change-Id: I3984e14f127d00b5b4d0e9ae4451227587b71d88

cord-pod/make-inframonitoring-yaml.sh

diff --git a/cord-pod/make-inframonitoring-yaml.sh b/cord-pod/make-inframonitoring-yaml.sh
index 2140931..00fc529 100644
--- a/cord-pod/make-inframonitoring-yaml.sh
+++ b/cord-pod/make-inframonitoring-yaml.sh
@@ -30,17 +30,6 @@
       artifacts:
           onos_monitoring_service_endpoints: /root/setup/onos_monitoring_service_endpoints.json
 
-    onos_monitoring_publisher_tenant:
-      description: ONOS Monitoring Publisher Tenant
-      type: tosca.nodes.ONOSMonitoringPublisher
-      requirements:
-          - provider_service:
-              node: service_ceilometer
-              relationship: tosca.relationships.TenantOfService
-          - monitoring_agent_1:
-              node: onos_monitoring_agent_head_node
-              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
-
     os_monitoring_agent_head_node:
       description: Openstack Monitoring agent info
       type: tosca.nodes.InfraMonitoringAgentInfo
@@ -87,11 +76,14 @@
           - monitoring_agent_1:
               node: os_monitoring_agent_head_node
               relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
+          - monitoring_agent_2:
+              node: onos_monitoring_agent_head_node
+              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
 EOF
 I=0
 for NODE in $NODES; do
           I=$(( I+1 ))
-          J=$(( I+1 ))
+          J=$(( I+2 ))
           cat >> $FN <<EOF
           - monitoring_agent_${J}:
               node: os_monitoring_agent_cp_${I}