commit d84b7b778663ae34f6fd034a7ed8c57fd122ec43
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Tue Jun 28 00:19:07 2016 +0000
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Wed Jun 29 04:53:59 2016 +0000
tree 81765f28e29c9036ebea59da5a2889dad3fce0bf
parent 031e1b63de704bd495d1329c59648fa87abfcd70

Fixes for onboarding Monitoring service

Change-Id: I6dc97fce6406ce7c0e371c8d9c064ae85c5f37b8

xos/tosca/resources/ceilometerservice.py

diff --git a/xos/tosca/resources/ceilometerservice.py b/xos/tosca/resources/ceilometerservice.py
index e77fa55..40c394f 100644
--- a/xos/tosca/resources/ceilometerservice.py
+++ b/xos/tosca/resources/ceilometerservice.py
@@ -6,14 +6,14 @@
 from translator.toscalib.tosca_template import ToscaTemplate
 
 from core.models import ServiceAttribute
-from services.ceilometer.models import CeilometerService
+from services.monitoring.models import CeilometerService
 
 from service import XOSService
 
 class XOSCeilometerService(XOSService):
     provides = "tosca.nodes.CeilometerService"
     xos_model = CeilometerService
-    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber", "ceilometer_pub_sub_url"]
+    copyin_props = ["view_url", "icon_url", "enabled", "published", "private_key_fn", "public_key", "versionNumber", "ceilometer_pub_sub_url"]
 
     def set_service_attr(self, obj, prop_name, value):
         value = self.try_intrinsic_function(value)