Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Eric Zheng
slapos.core
Commits
bb546aab
Commit
bb546aab
authored
Jul 04, 2011
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor code to add slave instance informations in dict
parent
4434190d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
9 deletions
+22
-9
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_asSoftwareInstanceComputerPartitionMergedDict.xml
...istLine_asSoftwareInstanceComputerPartitionMergedDict.xml
+21
-8
master/bt5/vifib_slap/bt/revision
master/bt5/vifib_slap/bt/revision
+1
-1
No files found.
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_asSoftwareInstanceComputerPartitionMergedDict.xml
View file @
bb546aab
...
@@ -50,19 +50,32 @@
...
@@ -50,19 +50,32 @@
</item>
</item>
<item>
<item>
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
sale_packing_list_line = context\n
<value>
<string>
checkPermission = context.getPortalObject().portal_membership.checkPermission\n
software_instance = sale_packing_list_line.getAggregateValue(portal_type=\'Software Instance\')\n
sale_packing_list_line = context\n
computer_partition = sale_packing_list_line.getAggregateValue(portal_type=[\'Computer Partition\', \'Slave Partition\'])\n
instance_type_list = [\'Software Instance\', \'Slave Instance\']\n
software_instance = sale_packing_list_line.getAggregateValue(portal_type=instance_type_list)\n
computer_partition = sale_packing_list_line.getAggregateValue(portal_type=\'Computer Partition\')\n
software_release = sale_packing_list_line.getAggregateValue(portal_type=\'Software Release\')\n
software_release = sale_packing_list_line.getAggregateValue(portal_type=\'Software Release\')\n
slave_id_list = []\n
ip_list = []\n
ip_list = []\n
if computer_partition.getPortalType() == \'Computer Partition\':\n
if computer_partition.getPortalType() == \'Computer Partition\':\n
slave_id_list = [slave_partition.getReference() for slave_partition in \\\n
computer_partition.contentValues(portal_type=\'Slave Partition\') \\\n
if slave_partition.getSlapState() == \'busy\']\n
for internet_protocol_address in computer_partition.contentValues(portal_type=\'Internet Protocol Address\'):\n
for internet_protocol_address in computer_partition.contentValues(portal_type=\'Internet Protocol Address\'):\n
ip_list.append((internet_protocol_address.getNetworkInterface(\'\'), internet_protocol_address.getIpAddress()))\n
ip_list.append((internet_protocol_address.getNetworkInterface(\'\'), internet_protocol_address.getIpAddress()))\n
if software_instance is not None and computer_partition is not None and software_release is not None:\n
if software_instance is not None and computer_partition is not None and software_release is not None:\n
slave_instance_list = []\n
sale_packing_list_line_list = computer_partition.getAggregateRelatedValueList(portal_type="Sale Packing List Line")\n
for sale_packing_list_line in sale_packing_list_line_list:\n
if checkPermission("Access contents information", sale_packing_list_line):\n
instance = sale_packing_list_line.getAggregateValue(portal_type=instance_type_list)\n
if instance is None:\n
continue\n
elif instance.getPortalType() == "Slave Instance":\n
slave_instance_list.append(dict(slap_software_type=instance.getSourceReference(),\n
xml=instance.getTextContent(),\n
connection_xml=instance.getConnectionXml(),\n
))\n
elif instance.getPortalType() == "Software Instance":\n
software_instance = instance\n
\n
return {\n
return {\n
\'xml\':software_instance.getTextContent(),\n
\'xml\':software_instance.getTextContent(),\n
\'connection_xml\':software_instance.getConnectionXml(),\n
\'connection_xml\':software_instance.getConnectionXml(),\n
...
@@ -71,7 +84,7 @@ if software_instance is not None and computer_partition is not None and software
...
@@ -71,7 +84,7 @@ if software_instance is not None and computer_partition is not None and software
\'slap_software_type\': software_instance.getSourceReference(),\n
\'slap_software_type\': software_instance.getSourceReference(),\n
\'slap_software_release_url\':software_release.getUrlString(),\n
\'slap_software_release_url\':software_release.getUrlString(),\n
\'slap_server_url\':context.getPortalObject().portal_slap.absolute_url(),\n
\'slap_server_url\':context.getPortalObject().portal_slap.absolute_url(),\n
\'slave_i
d_list\':slave_id_list, # XXX: Is it really ok to send non string in instance xml dict?
\n
\'slave_i
nstance_list\':slave_instance_list,
\n
\'ip_list\':ip_list,\n
\'ip_list\':ip_list,\n
}\n
}\n
return None\n
return None\n
...
...
master/bt5/vifib_slap/bt/revision
View file @
bb546aab
385
386
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment