Changeset 5334044 for fedd/federation/emulab_access.py
- Timestamp:
- May 27, 2010 2:25:36 AM (14 years ago)
- Branches:
- axis_example, compt_changes, info-ops, master, version-3.01, version-3.02
- Children:
- 1962a5b
- Parents:
- 0de1b94
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fedd/federation/emulab_access.py
r0de1b94 r5334044 131 131 # XXX: Configurable 132 132 self.exports = set(('SMB', 'seer', 'tmcd', 'userconfig', 133 'project_export', 'local_seer_control', 'seer_master')) 134 self.imports = set(('SMB', 'seer', 'userconfig', 'seer_master')) 133 'project_export', 'local_seer_control', 'seer_master', 134 'hide_hosts')) 135 self.imports = set(('SMB', 'seer', 'userconfig', 'seer_master', 136 'hide_hosts')) 135 137 136 138 if not self.local_seer_image or not self.local_seer_software: … … 583 585 return confid, confcert 584 586 585 def export_SMB(self, id, state, project, user ):587 def export_SMB(self, id, state, project, user, attrs): 586 588 return { 587 589 'id': id, … … 596 598 } 597 599 598 def export_seer(self, id, state, project, user ):600 def export_seer(self, id, state, project, user, attrs): 599 601 return { 600 602 'id': id, … … 604 606 } 605 607 606 def export_local_seer(self, id, state, project, user ):608 def export_local_seer(self, id, state, project, user, attrs): 607 609 return { 608 610 'id': id, … … 612 614 } 613 615 614 def export_seer_master(self, id, state, project, user ):616 def export_seer_master(self, id, state, project, user, attrs): 615 617 return { 616 618 'id': id, … … 620 622 } 621 623 622 def export_tmcd(self, id, state, project, user ):624 def export_tmcd(self, id, state, project, user, attrs): 623 625 return { 624 626 'id': id, … … 628 630 } 629 631 630 def export_userconfig(self, id, state, project, user ):632 def export_userconfig(self, id, state, project, user, attrs): 631 633 if self.userconfdir and self.userconfcmd \ 632 634 and self.userconfurl: … … 645 647 return None 646 648 649 def export_hide_hosts(self, id, state, project, user, attrs): 650 return { 651 'id': id, 652 'name': 'hide_hosts', 653 'visibility': 'export', 654 'fedAttr': [ x for x in attrs \ 655 if x.get('attribute', "") == 'hosts'], 656 } 657 647 658 def export_services(self, sreq, project, user): 648 659 exp = [ ] … … 653 664 sname = s.get('name', '') 654 665 svis = s.get('visibility', '') 666 sattrs = s.get('fedAttr', []) 655 667 if svis == 'export': 656 668 if sname in self.exports: 657 669 id = s.get('id', 'no_id') 658 670 if sname == 'SMB': 659 exp.append(self.export_SMB(id, state, project, user)) 671 exp.append(self.export_SMB(id, state, project, user, 672 sattrs)) 660 673 elif sname == 'seer': 661 exp.append(self.export_seer(id, state, project, user)) 674 exp.append(self.export_seer(id, state, project, user, 675 sattrs)) 662 676 elif sname == 'tmcd': 663 exp.append(self.export_tmcd(id, state, project, user)) 677 exp.append(self.export_tmcd(id, state, project, user, 678 sattrs)) 664 679 elif sname == 'userconfig': 665 680 exp.append(self.export_userconfig(id, state, 666 project, user ))681 project, user, sattrs)) 667 682 elif sname == 'project_export': 668 exp.append(self.export_SMB(id, state, project, user)) 669 #exp.append(self.export_seer(id, state, project, user)) 683 exp.append(self.export_SMB(id, state, project, user, 684 sattrs)) 685 #exp.append(self.export_seer(id, state, project, user, 686 #sattrs)) 670 687 exp.append(self.export_userconfig(id, state, 671 project, user ))688 project, user, sattrs)) 672 689 elif sname == 'local_seer_control': 673 690 exp.append(self.export_local_seer(id, state, project, 674 user ))691 user, sattrs)) 675 692 elif sname == 'seer_master': 676 693 exp.append(self.export_seer_master(id, state, project, 677 user)) 694 user, sattrs)) 695 elif sname == 'hide_hosts': 696 exp.append(self.export_hide_hosts(id, state, project, 697 user, sattrs)) 678 698 return (exp, state) 679 699 … … 1094 1114 print >>f, "ProjectName: %s" % smbproj 1095 1115 1116 def client_hide_hosts(f, s): 1117 for a in s.get('fedAttr', [ ]): 1118 if a.get('attribute', "") == 'hosts': 1119 print >>f, "Hide: %s" % a.get('value', "") 1120 1096 1121 client_service_out = { 1097 1122 'SMB': client_smb, … … 1101 1126 'project_export': client_null, 1102 1127 'seer_master': client_seer_master, 1128 'hide_hosts': client_hide_hosts, 1103 1129 } 1104 1130 … … 1130 1156 'seer': server_seer, 1131 1157 'seer_master': server_port, 1158 'hide_hosts': server_null, 1132 1159 } 1133 1160 # XXX: end un hardcode this
Note: See TracChangeset
for help on using the changeset viewer.