Permalink
Browse files

prepend cyder module name to app imports, get rid of symlinks

  • Loading branch information...
1 parent a8dfcf2 commit cfa9af22aaa5163c70c517940579d925fed0adf4 @ngokevin committed Oct 3, 2012
Showing with 1,303 additions and 1,292 deletions.
  1. +1 −1 cyder/MozInvAuthorization/KeyValueACL.py
  2. +1 −1 cyder/MozInvAuthorization/UnmanagedSystemACL.py
  3. +2 −2 cyder/adapters/KeyValueTree.py
  4. +2 −2 cyder/adapters/MacroExpansion.py
  5. +2 −2 cyder/adapters/TaskScheduler.py
  6. +10 −10 cyder/api/handlers.py
  7. +1 −1 cyder/api/tests.py
  8. +4 −4 cyder/api/urls.py
  9. +4 −4 cyder/api_v1/dhcp_handler.py
  10. +4 −4 cyder/api_v1/handlers.py
  11. +12 −12 cyder/api_v1/keyvalue_handler.py
  12. +4 −4 cyder/api_v1/networkadapter_handler.py
  13. +4 −4 cyder/api_v1/relengdistro_handler.py
  14. +2 −2 cyder/api_v1/reverse_dns_handler.py
  15. +4 −4 cyder/api_v1/system_handler.py
  16. +1 −1 cyder/api_v1/system_rack_handler.py
  17. +1 −1 cyder/api_v1/system_status_handler.py
  18. +1 −1 cyder/api_v1/tests.py
  19. +4 −4 cyder/api_v1/truth_handler.py
  20. +8 −8 cyder/api_v1/urls.py
  21. +4 −4 cyder/api_v2/dhcp_handler.py
  22. +4 −4 cyder/api_v2/handlers.py
  23. +13 −13 cyder/api_v2/keyvalue_handler.py
  24. +4 −4 cyder/api_v2/networkadapter_handler.py
  25. +2 −2 cyder/api_v2/oncall_handler.py
  26. +4 −4 cyder/api_v2/relengdistro_handler.py
  27. +2 −2 cyder/api_v2/reverse_dns_handler.py
  28. +5 −5 cyder/api_v2/system_handler.py
  29. +1 −1 cyder/api_v2/system_rack_handler.py
  30. +1 −1 cyder/api_v2/system_status_handler.py
  31. +2 −2 cyder/api_v2/tests.py
  32. +4 −4 cyder/api_v2/truth_handler.py
  33. +9 −9 cyder/api_v2/urls.py
  34. +7 −7 cyder/api_v3/system_api.py
  35. +7 −7 cyder/api_v3/tests.py
  36. +1 −1 cyder/build/models.py
  37. +1 −1 cyder/build/urls.py
  38. +1 −1 cyder/build/views.py
  39. +3 −3 cyder/core/build/subnet.py
  40. +1 −1 cyder/core/build/urls.py
  41. +2 −2 cyder/core/build/views.py
  42. +1 −1 cyder/core/bulk_change/urls.py
  43. +17 −17 cyder/core/bulk_change/views.py
  44. +3 −3 cyder/core/interface/dynamic_intr/models.py
  45. +9 −9 cyder/core/interface/static_intr/forms.py
  46. +13 −13 cyder/core/interface/static_intr/models.py
  47. +6 −6 cyder/core/interface/static_intr/tests/A_tests.py
  48. +6 −6 cyder/core/interface/static_intr/tests/CNAME_tests.py
  49. +5 −5 cyder/core/interface/static_intr/tests/PTR_tests.py
  50. +7 −7 cyder/core/interface/static_intr/tests/all.py
  51. +8 −8 cyder/core/interface/static_intr/tests/aux_attrs.py
  52. +8 −8 cyder/core/interface/static_intr/tests/basic.py
  53. +7 −7 cyder/core/interface/static_intr/tests/deletetion.py
  54. +6 −6 cyder/core/interface/static_intr/tests/ipv6_basic.py
  55. +8 −8 cyder/core/interface/static_intr/tests/system_integration.py
  56. +18 −18 cyder/core/interface/static_intr/views.py
  57. +1 −1 cyder/core/interface/urls.py
  58. +2 −2 cyder/core/interface/utils.py
  59. +2 −2 cyder/core/keyvalue/base_option.py
  60. +3 −3 cyder/core/lib/tests/all.py
  61. +9 −9 cyder/core/lib/tests/free_ip.py
  62. +8 −8 cyder/core/lib/tests/intr_from_domain.py
  63. +9 −9 cyder/core/lib/tests/intr_from_range.py
  64. +12 −12 cyder/core/lib/utils.py
  65. +4 −4 cyder/core/network/forms.py
  66. +8 −8 cyder/core/network/models.py
  67. +11 −11 cyder/core/network/network_wizard.py
  68. +4 −4 cyder/core/network/tests.py
  69. +2 −2 cyder/core/network/urls.py
  70. +1 −1 cyder/core/network/utils.py
  71. +13 −13 cyder/core/network/views.py
  72. +5 −5 cyder/core/populate.py
  73. +1 −1 cyder/core/range/forms.py
  74. +8 −8 cyder/core/range/models.py
  75. +2 −2 cyder/core/range/tests/all.py
  76. +5 −5 cyder/core/range/tests/ipv4_tests.py
  77. +3 −3 cyder/core/range/tests/ipv6_tests.py
  78. +1 −1 cyder/core/range/urls.py
  79. +10 −10 cyder/core/range/views.py
  80. +5 −5 cyder/core/search/compile_search.py
  81. +10 −10 cyder/core/search/compiler/compiler.py
  82. +10 −10 cyder/core/search/compiler/tokenizer.py
  83. +1 −1 cyder/core/search/management/commands/compile_test.py
  84. +4 −4 cyder/core/search/search.py
  85. +1 −1 cyder/core/search/urls.py
  86. +17 −17 cyder/core/search/views.py
  87. +2 −2 cyder/core/site/forms.py
  88. +2 −2 cyder/core/site/models.py
  89. +1 −1 cyder/core/site/urls.py
  90. +1 −1 cyder/core/site/utils.py
  91. +8 −8 cyder/core/site/views.py
  92. +7 −7 cyder/core/tests/all.py
  93. +12 −12 cyder/core/urls.py
  94. +8 −8 cyder/core/views.py
  95. +2 −2 cyder/core/vlan/forms.py
  96. +4 −4 cyder/core/vlan/models.py
  97. +1 −1 cyder/core/vlan/urls.py
  98. +8 −8 cyder/core/vlan/views.py
  99. +1 −1 cyder/dhcp/compare_tests.py
  100. +1 −1 cyder/dhcp/urls.py
  101. +3 −3 cyder/dhcp/views.py
  102. +0 −1 cyder/inventory
  103. +1 −1 cyder/libs/DHCPHelper.py
  104. +2 −2 cyder/libs/Rack.py
  105. +2 −2 cyder/mdns/build_nics.py
  106. +33 −33 cyder/mdns/dns_build.py
  107. +4 −4 cyder/mdns/inventory_build.py
  108. +1 −1 cyder/mdns/management/commands/builddns.py
  109. +1 −1 cyder/mdns/management/commands/buildnetworks.py
  110. +1 −1 cyder/mdns/management/commands/buildzone.py
  111. +1 −1 cyder/mdns/management/commands/buildzone2.py
  112. +1 −1 cyder/mdns/management/commands/buildzone3.py
  113. +26 −26 cyder/mdns/network_build.py
  114. +24 −24 cyder/mdns/suck_zone.py
  115. +2 −2 cyder/mdns/svn_build.py
  116. +3 −3 cyder/mdns/tests/all.py
  117. +2 −2 cyder/mdns/tests/include_forward.py
  118. +2 −2 cyder/mdns/tests/include_reverse.py
  119. +2 −2 cyder/mdns/tests/soa.py
  120. +21 −21 cyder/mdns/zone_migrate.py
  121. +1 −1 cyder/middleware/restrict_by_api_token.py
  122. +1 −1 cyder/mozdns/address_record/forms.py
  123. +13 −13 cyder/mozdns/address_record/models.py
  124. +2 −2 cyder/mozdns/address_record/search_indexes.py
  125. +7 −7 cyder/mozdns/address_record/tests.py
  126. +1 −1 cyder/mozdns/address_record/urls.py
  127. +6 −6 cyder/mozdns/address_record/views.py
  128. +7 −7 cyder/mozdns/api.py
  129. +1 −1 cyder/mozdns/api/tests/all.py
  130. +16 −16 cyder/mozdns/api/tests/basic.py
  131. +16 −16 cyder/mozdns/api/tests/kv.py
  132. +13 −13 cyder/mozdns/api/tests/ptr.py
  133. +17 −17 cyder/mozdns/api/v1/api.py
  134. +1 −1 cyder/mozdns/cname/forms.py
  135. +4 −4 cyder/mozdns/cname/models.py
  136. +2 −2 cyder/mozdns/cname/search_indexes.py
  137. +13 −13 cyder/mozdns/cname/tests.py
  138. +1 −1 cyder/mozdns/cname/urls.py
  139. +7 −7 cyder/mozdns/cname/views.py
  140. +1 −1 cyder/mozdns/domain/forms.py
  141. +10 −10 cyder/mozdns/domain/models.py
  142. +6 −6 cyder/mozdns/domain/reverse_tests.py
  143. +1 −1 cyder/mozdns/domain/search_indexes.py
  144. +15 −15 cyder/mozdns/domain/tests/auto_create.py
  145. +17 −17 cyder/mozdns/domain/tests/auto_delete.py
  146. +14 −14 cyder/mozdns/domain/tests/auto_update.py
  147. +12 −12 cyder/mozdns/domain/tests/basic.py
  148. +15 −15 cyder/mozdns/domain/tests/full_name.py
  149. +1 −1 cyder/mozdns/domain/urls.py
  150. +2 −2 cyder/mozdns/domain/utils.py
  151. +3 −3 cyder/mozdns/domain/view_tests.py
  152. +14 −14 cyder/mozdns/domain/views.py
  153. +1 −1 cyder/mozdns/ip/forms.py
  154. +3 −3 cyder/mozdns/ip/models.py
  155. +3 −3 cyder/mozdns/ip/tests.py
  156. +1 −1 cyder/mozdns/ip/utils.py
  157. +12 −12 cyder/mozdns/master_form/tests.py
  158. +2 −2 cyder/mozdns/master_form/urls.py
  159. +19 −19 cyder/mozdns/master_form/views.py
  160. +7 −7 cyder/mozdns/models.py
  161. +2 −2 cyder/mozdns/mozbind/generators/bind_reverse_domain_generator.py
  162. +1 −1 cyder/mozdns/mozbind/management/commands/bindbuild.py
  163. +13 −13 cyder/mozdns/mozbind/tests.py
  164. +1 −1 cyder/mozdns/mozbind/urls.py
  165. +1 −1 cyder/mozdns/mx/forms.py
  166. +5 −5 cyder/mozdns/mx/models.py
  167. +2 −2 cyder/mozdns/mx/search_indexes.py
  168. +3 −3 cyder/mozdns/mx/tests.py
  169. +1 −1 cyder/mozdns/mx/urls.py
  170. +7 −7 cyder/mozdns/mx/views.py
  171. +3 −3 cyder/mozdns/nameserver/forms.py
  172. +11 −11 cyder/mozdns/nameserver/models.py
  173. +1 −1 cyder/mozdns/nameserver/search_indexes.py
  174. +8 −8 cyder/mozdns/nameserver/tests.py
  175. +1 −1 cyder/mozdns/nameserver/urls.py
  176. +3 −3 cyder/mozdns/nameserver/view_tests.py
  177. +6 −6 cyder/mozdns/nameserver/views.py
  178. +1 −1 cyder/mozdns/ptr/forms.py
  179. +8 −8 cyder/mozdns/ptr/models.py
  180. +1 −1 cyder/mozdns/ptr/search_indexes.py
  181. +6 −6 cyder/mozdns/ptr/tests.py
  182. +1 −1 cyder/mozdns/ptr/urls.py
  183. +10 −10 cyder/mozdns/ptr/views.py
  184. +1 −1 cyder/mozdns/soa/forms.py
  185. +4 −4 cyder/mozdns/soa/models.py
  186. +1 −1 cyder/mozdns/soa/search_indexes.py
  187. +2 −2 cyder/mozdns/soa/tests.py
  188. +1 −1 cyder/mozdns/soa/urls.py
  189. +2 −2 cyder/mozdns/soa/view_tests.py
  190. +12 −12 cyder/mozdns/soa/views.py
  191. +1 −1 cyder/mozdns/srv/forms.py
  192. +13 −13 cyder/mozdns/srv/models.py
  193. +2 −2 cyder/mozdns/srv/tests.py
  194. +1 −1 cyder/mozdns/srv/urls.py
  195. +7 −7 cyder/mozdns/srv/views.py
  196. +1 −1 cyder/mozdns/sshfp/forms.py
  197. +1 −1 cyder/mozdns/sshfp/models.py
  198. +2 −2 cyder/mozdns/sshfp/search_indexes.py
  199. +2 −2 cyder/mozdns/sshfp/tests.py
  200. +1 −1 cyder/mozdns/sshfp/urls.py
  201. +7 −7 cyder/mozdns/sshfp/views.py
  202. +3 −3 cyder/mozdns/super_views.py
  203. +6 −6 cyder/mozdns/tests/all.py
  204. +15 −15 cyder/mozdns/tests/model_tests.py
  205. +8 −8 cyder/mozdns/tests/view_tests.py
  206. +2 −2 cyder/mozdns/tests/view_tests_template.py
  207. +1 −1 cyder/mozdns/txt/forms.py
  208. +1 −1 cyder/mozdns/txt/models.py
  209. +2 −2 cyder/mozdns/txt/search_indexes.py
  210. +2 −2 cyder/mozdns/txt/tests.py
  211. +1 −1 cyder/mozdns/txt/urls.py
  212. +7 −7 cyder/mozdns/txt/views.py
  213. +15 −15 cyder/mozdns/urls.py
  214. +9 −9 cyder/mozdns/utils.py
  215. +1 −1 cyder/mozdns/validation.py
  216. +1 −1 cyder/mozdns/view/forms.py
  217. +1 −1 cyder/mozdns/view/models.py
  218. +2 −2 cyder/mozdns/view/search_indexes.py
  219. +6 −6 cyder/mozdns/view/tests.py
  220. +1 −1 cyder/mozdns/view/urls.py
  221. +7 −7 cyder/mozdns/view/views.py
  222. +4 −4 cyder/mozdns/views.py
  223. +1 −1 cyder/mozdns/zone_creation/urls.py
  224. +19 −19 cyder/mozdns/zone_creation/views.py
  225. +0 −1 cyder/mozilla_inventory
  226. +1 −1 cyder/reports/forms.py
  227. +2 −2 cyder/reports/urls.py
  228. +3 −3 cyder/reports/views.py
  229. +1 −1 cyder/scripts/add_all_dhcp_zones_to_schedulded_tasks.py
  230. +18 −18 cyder/scripts/auto_associate_systems_to_static_interfaces.py
  231. +8 −8 cyder/scripts/import_fix.sh
  232. +13 −0 cyder/scripts/import_fix_settings.sh
  233. +3 −3 cyder/scripts/output_dhcp_config_files_svn.py
  234. +1 −1 cyder/scripts/updated_hostname_report.py
  235. +2 −2 cyder/settings/base.py
  236. +1 −1 cyder/systems/admin.py
  237. +5 −5 cyder/systems/models.py
  238. +8 −8 cyder/systems/tests.py
  239. +1 −1 cyder/systems/urls.py
  240. +8 −8 cyder/systems/views.py
  241. +1 −1 cyder/templates/systems/index.html
  242. +4 −4 cyder/tests/tests.py
  243. +1 −1 cyder/truth/models.py
  244. +1 −1 cyder/truth/urls.py
  245. +23 −23 cyder/urls.py
  246. +1 −1 cyder/user_systems/models.py
  247. +1 −1 cyder/user_systems/urls.py
  248. +2 −2 cyder/user_systems/views.py
@@ -1,5 +1,5 @@
from django.core.exceptions import PermissionDenied
-from MozInvAuthorization.BaseKeyValueACL import BaseKeyValueACL
+from cyder.MozInvAuthorization.BaseKeyValueACL import BaseKeyValueACL
from django.conf import settings
import systems.models as SystemModels
@@ -1,5 +1,5 @@
from django.core.exceptions import PermissionDenied
-from MozInvAuthorization.BaseACL import BaseACL
+from cyder.MozInvAuthorization.BaseACL import BaseACL
from django.conf import settings
@@ -3,8 +3,8 @@
from django.core.management import setup_environ
import settings
-from systems.models import System, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.systems.models import System, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
import re
from MacroExpansion import MacroExpansion
@@ -1,5 +1,5 @@
-from systems.models import System, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.systems.models import System, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
class MacroExpansion:
@@ -4,8 +4,8 @@
import settings
setup_environ(settings)
-from systems.models import System, KeyValue, TaskScheduler
-from truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.systems.models import System, KeyValue, TaskScheduler
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
import re
View
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
@@ -321,7 +321,7 @@ def read(self, request, key_value_id=None):
key_type = request.GET['key_type']
tmp_list = []
if key_type == 'dhcp_scopes':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
base = TruthKeyValue.objects.filter(
key='dhcp.is_scope', value='True')
#Iterate through the list and get all of the key/value pairs
@@ -334,7 +334,7 @@ def read(self, request, key_value_id=None):
return tmp_list
if key_type == 'system_by_scope':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
keyvalue_pairs = KeyValue.objects.filter(key__contains='dhcp_scope', value=request.GET['scope']).filter(key__startswith='nic.')
#Iterate through the list and get all of the key/value pairs
tmp_list = []
@@ -355,7 +355,7 @@ def read(self, request, key_value_id=None):
#tmp_list = list(set(tmp_list))
return tmp_list
if key_type == 'adapters_by_system':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
system = System.objects.get(hostname=request.GET['system'])
keyvalue_pairs = KeyValue.objects.filter(key__startswith='nic.').filter(system=system).order_by('key')
#Iterate through the list and get all of the key/value pairs
@@ -401,7 +401,7 @@ def read(self, request, key_value_id=None):
#tmp_list.append(tmp_dict)
return final_list
if key_type == 'adapters_by_system_and_scope':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
dhcp_scope = request.GET['dhcp_scope']
system = System.objects.get(hostname=request.GET['system'])
keyvalue_pairs = KeyValue.objects.filter(key__startswith='nic.').filter(system=system).order_by('key')
@@ -560,7 +560,7 @@ def read(self, request, key_value_id=None):
return base"""
def delete(self, request, key_value_id=None):
if 'key_type' in request.GET and request.GET['key_type'] == 'delete_all_network_adapters':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
try:
system_hostname = request.GET['system_hostname']
system = System.objects.get(hostname=system_hostname)
@@ -574,7 +574,7 @@ def delete(self, request, key_value_id=None):
return resp
if 'key_type' in request.GET and request.GET['key_type'] == 'delete_network_adapter':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
try:
adapter_number = request.GET['adapter_number']
system_hostname = request.GET['system_hostname']
View
@@ -6,7 +6,7 @@
from django.utils import simplejson as json
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
-from truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
class TestMacroExpansion(TestCase):
View
@@ -1,9 +1,9 @@
from django.conf.urls.defaults import *
from piston.resource import Resource
-from api.handlers import SystemHandler
-from api.handlers import NetworkAdapterHandler
-from api.handlers import KeyValueHandler
-from api.handlers import DHCPHandler
+from cyder.api.handlers import SystemHandler
+from cyder.api.handlers import NetworkAdapterHandler
+from cyder.api.handlers import KeyValueHandler
+from cyder.api.handlers import DHCPHandler
systems_handler = Resource(SystemHandler)
network_adapter_handler = Resource(NetworkAdapterHandler)
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
View
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, RelengDistro, SystemRack, SystemStatus, NetworkAdapter, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, RelengDistro, SystemRack, SystemStatus, NetworkAdapter, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
@@ -221,7 +221,7 @@ def read(self, request, key_value_id=None):
key_type = request.GET['key_type']
tmp_list = []
if key_type == 'dhcp_scopes':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
base = TruthKeyValue.objects.filter(
key='dhcp.is_scope', value='True')
#Iterate through the list and get all of the key/value pairs
@@ -235,7 +235,7 @@ def read(self, request, key_value_id=None):
if key_type == 'system_by_reverse_dns_zone':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
keyvalue_pairs = KeyValue.objects.filter(key__contains='reverse_dns_zone', value=request.GET['zone']).filter(key__startswith='nic.')
#Iterate through the list and get all of the key/value pairs
tmp_list = []
@@ -256,7 +256,7 @@ def read(self, request, key_value_id=None):
#tmp_list = list(set(tmp_list))
return tmp_list
if key_type == 'system_by_scope':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
keyvalue_pairs = KeyValue.objects.filter(key__contains='dhcp_scope', value=request.GET['scope']).filter(key__startswith='nic.')
#Iterate through the list and get all of the key/value pairs
tmp_list = []
@@ -277,7 +277,7 @@ def read(self, request, key_value_id=None):
#tmp_list = list(set(tmp_list))
return tmp_list
if key_type == 'adapters_by_system':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
system = System.objects.get(hostname=request.GET['system'])
keyvalue_pairs = KeyValue.objects.filter(key__startswith='nic.').filter(system=system).order_by('key')
#Iterate through the list and get all of the key/value pairs
@@ -322,7 +322,7 @@ def read(self, request, key_value_id=None):
#tmp_list.append(tmp_dict)
return final_list
if key_type == 'adapters_by_system_and_zone':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
zone = request.GET['zone']
system = System.objects.get(hostname=request.GET['system'])
keyvalue_pairs = KeyValue.objects.filter(key__startswith='nic.').filter(system=system).order_by('key')
@@ -365,7 +365,7 @@ def read(self, request, key_value_id=None):
#tmp_list.append(tmp_dict)
return final_list
if key_type == 'adapters_by_system_and_scope':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
dhcp_scope = request.GET['dhcp_scope']
system = System.objects.get(hostname=request.GET['system'])
keyvalue_pairs = KeyValue.objects.filter(key__startswith='nic.').filter(system=system).order_by('key')
@@ -468,7 +468,7 @@ def read(self, request, key_value_id=None):
def delete(self, request, key_value_id=None):
if 'key_type' in request.GET and request.GET['key_type'] == 'delete_all_network_adapters':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
try:
system_hostname = request.GET['system_hostname']
system = System.objects.get(hostname=system_hostname)
@@ -482,7 +482,7 @@ def delete(self, request, key_value_id=None):
return resp
if 'key_type' in request.GET and request.GET['key_type'] == 'delete_network_adapter':
- #Get keystores from truth that have dhcp.is_scope = True
+ #Get keystores from cyder.truth that have dhcp.is_scope = True
try:
adapter_number = request.GET['adapter_number']
system_hostname = request.GET['system_hostname']
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, RelengDistro, SystemRack, SystemStatus, NetworkAdapter, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, RelengDistro, SystemRack, SystemStatus, NetworkAdapter, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
@@ -1,6 +1,6 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
-from truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ServerModel, Allocation
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ServerModel, Allocation
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
@@ -1,5 +1,5 @@
from piston.handler import BaseHandler, rc
-from systems.models import SystemRack
+from cyder.systems.models import SystemRack
import re
try:
import json
@@ -1,5 +1,5 @@
from piston.handler import BaseHandler, rc
-from systems.models import SystemStatus
+from cyder.systems.models import SystemStatus
import re
try:
import json
View
@@ -6,7 +6,7 @@
from django.utils import simplejson as json
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
-from truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
class TestMacroExpansion(TestCase):
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
View
@@ -1,13 +1,13 @@
from django.conf.urls.defaults import *
from piston.resource import Resource
-from api_v2.system_handler import SystemHandler
-from api_v2.networkadapter_handler import NetworkAdapterHandler
-from api_v2.keyvalue_handler import KeyValueHandler
-from api_v2.truth_handler import TruthHandler
-from api_v2.dhcp_handler import DHCPHandler
-from api_v2.reverse_dns_handler import ReverseDNSHandler
-from api_v2.system_rack_handler import SystemRackHandler
-from api_v2.system_status_handler import SystemStatusHandler
+from cyder.api_v2.system_handler import SystemHandler
+from cyder.api_v2.networkadapter_handler import NetworkAdapterHandler
+from cyder.api_v2.keyvalue_handler import KeyValueHandler
+from cyder.api_v2.truth_handler import TruthHandler
+from cyder.api_v2.dhcp_handler import DHCPHandler
+from cyder.api_v2.reverse_dns_handler import ReverseDNSHandler
+from cyder.api_v2.system_rack_handler import SystemRackHandler
+from cyder.api_v2.system_status_handler import SystemStatusHandler
from django.views.decorators.cache import cache_control
cached_resource = cache_control(public=True, maxage=600, s_maxage=600)
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, SystemRack, SystemStatus, NetworkAdapter, KeyValue, ScheduledTask
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
View
@@ -1,8 +1,8 @@
from piston.handler import BaseHandler, rc
-from systems.models import System, RelengDistro, SystemRack, SystemStatus, NetworkAdapter, KeyValue
-from truth.models import Truth, KeyValue as TruthKeyValue
-from dhcp.DHCP import DHCP as DHCPInterface
-from dhcp.models import DHCP
+from cyder.systems.models import System, RelengDistro, SystemRack, SystemStatus, NetworkAdapter, KeyValue
+from cyder.truth.models import Truth, KeyValue as TruthKeyValue
+from cyder.dhcp.DHCP import DHCP as DHCPInterface
+from cyder.dhcp.models import DHCP
from MacroExpansion import MacroExpansion
from KeyValueTree import KeyValueTree
import re
Oops, something went wrong.

0 comments on commit cfa9af2

Please sign in to comment.