projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
[osm/SO.git]
/
common
/
python
/
rift
/
mano
/
tosca_translator
/
rwmano
/
tosca
/
tosca_initial_config.py
diff --git
a/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_initial_config.py
b/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_initial_config.py
index
9b7cd03
..
262c11a
100644
(file)
--- a/
common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_initial_config.py
+++ b/
common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_initial_config.py
@@
-53,8
+53,7
@@
class ToscaInitialConfig(ManoResource):
self.log.debug(_("{0} with tosca properties: {1}").
format(self, tosca_props))
self.properties['name'] = tosca_props['name']
self.log.debug(_("{0} with tosca properties: {1}").
format(self, tosca_props))
self.properties['name'] = tosca_props['name']
- self.properties['seq'] = \
- tosca_props['seq']
+ self.properties['seq'] = int(tosca_props['seq'])
self.properties['user-defined-script'] = \
tosca_props['user_defined_script']
self.scripts.append('../scripts/{}'. \
self.properties['user-defined-script'] = \
tosca_props['user_defined_script']
self.scripts.append('../scripts/{}'. \
@@
-62,12
+61,11
@@
class ToscaInitialConfig(ManoResource):
if 'parameter' in tosca_props:
self.properties['parameter'] = []
if 'parameter' in tosca_props:
self.properties['parameter'] = []
- for
name, value in tosca_props['parameter'].items()
:
+ for
parameter in tosca_props['parameter']
:
self.properties['parameter'].append({
self.properties['parameter'].append({
- 'name':
name
,
- 'value':
value
,
+ 'name':
parameter['name']
,
+ 'value':
str(parameter['value'])
,
})
})
-
self.log.debug(_("{0} properties: {1}").format(self, self.properties))
def get_policy_props(self):
self.log.debug(_("{0} properties: {1}").format(self, self.properties))
def get_policy_props(self):