Graph point attributes cannot be added

[N-faycal]

When importing a report using zenossYAMLTool, gp attributes are not added correctly.
getGraphPoints() output returns graph points which have their IDs not containing their respective datasource names (ie, the first word before an underscore). The script expects the IDs to match exactly the "gpName". It is never the case. And that's why attributes cannot be added correctly. A way to resolve this is to change the condition on line 821 from
if gpo.id == gp['gpName']:
to
if gpo.id in gp['gpName']:

A better way to do is to prepare the expected names by removing from the gpName prefix and adding an index if necessary. Just as Zenoss would do.