Browse Source

Fix neutron-lbaas-dashboard and octavia-dashboard

This patch fixes neutron-lbaas-dashboard to function properly when
installed in horizon with octavia-dashboard.

Story: 2004913
Task: 29266

Change-Id: Ib3e1e4d0bef08745bdbba2437481bfba169931ec
tags/6.0.0.0rc1^2
Michael Johnson 3 months ago
parent
commit
cddbf697e6
100 changed files with 462 additions and 462 deletions
  1. 1
    1
      neutron_lbaas_dashboard/api/rest/__init__.py
  2. 19
    19
      neutron_lbaas_dashboard/api/rest/nlbaasv2.py
  3. 1
    1
      neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/panel.py
  4. 1
    1
      neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/views.py
  5. 2
    2
      neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py
  6. 47
    47
      neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.js
  7. 27
    27
      neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.spec.js
  8. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.js
  9. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.spec.js
  10. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.js
  11. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.spec.js
  12. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.js
  13. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js
  14. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.js
  15. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js
  16. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.js
  17. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js
  18. 6
    6
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.js
  19. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.spec.js
  20. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.js
  21. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.spec.js
  22. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.html
  23. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.js
  24. 1
    1
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.spec.js
  25. 7
    7
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.js
  26. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.spec.js
  27. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.js
  28. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.spec.js
  29. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.js
  30. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.spec.js
  31. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.js
  32. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.spec.js
  33. 8
    8
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.js
  34. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.spec.js
  35. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.js
  36. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.spec.js
  37. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.html
  38. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.js
  39. 1
    1
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.spec.js
  40. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.js
  41. 6
    6
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.spec.js
  42. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.html
  43. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.js
  44. 10
    10
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js
  45. 0
    0
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.html
  46. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.js
  47. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js
  48. 8
    8
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.js
  49. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.spec.js
  50. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.js
  51. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.spec.js
  52. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.js
  53. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js
  54. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js
  55. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js
  56. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.js
  57. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js
  58. 8
    8
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.js
  59. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.spec.js
  60. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.js
  61. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.spec.js
  62. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.html
  63. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.js
  64. 1
    1
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.module.spec.js
  65. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.js
  66. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/loadbalancers.service.spec.js
  67. 6
    6
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.js
  68. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.controller.spec.js
  69. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/table.html
  70. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.js
  71. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/batch-actions.service.spec.js
  72. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.js
  73. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.controller.spec.js
  74. 0
    0
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.html
  75. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.js
  76. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/edit-weight/modal.service.spec.js
  77. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.js
  78. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/row-actions.service.spec.js
  79. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.js
  80. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/update-member-list.service.spec.js
  81. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.js
  82. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/actions/update-list/wizard.controller.spec.js
  83. 6
    6
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.js
  84. 7
    7
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.controller.spec.js
  85. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/detail.html
  86. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.js
  87. 1
    1
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.module.spec.js
  88. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.js
  89. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/members.service.spec.js
  90. 7
    7
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.js
  91. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.controller.spec.js
  92. 3
    3
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/members/table.html
  93. 11
    11
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.js
  94. 9
    9
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.module.spec.js
  95. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/nlbaasv2.scss
  96. 5
    5
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.js
  97. 2
    2
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/create.action.service.spec.js
  98. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.js
  99. 4
    4
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/create/wizard.controller.spec.js
  100. 0
    0
      neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/pools/actions/delete/delete.action.service.js

+ 1
- 1
neutron_lbaas_dashboard/api/rest/__init__.py View File

@@ -23,4 +23,4 @@ in https://wiki.openstack.org/wiki/APIChangeGuidelines.
23 23
 
24 24
 # import REST API modules here
25 25
 from neutron_lbaas_dashboard.api.rest import barbican  # noqa
26
-from neutron_lbaas_dashboard.api.rest import lbaasv2  # noqa
26
+from neutron_lbaas_dashboard.api.rest import nlbaasv2  # noqa

neutron_lbaas_dashboard/api/rest/lbaasv2.py → neutron_lbaas_dashboard/api/rest/nlbaasv2.py View File

@@ -406,7 +406,7 @@ class LoadBalancers(generic.View):
406 406
     """API for load balancers.
407 407
 
408 408
     """
409
-    url_regex = r'lbaas/loadbalancers/$'
409
+    url_regex = r'nlbaas/loadbalancers/$'
410 410
 
411 411
     @rest_utils.ajax()
412 412
     def get(self, request):
@@ -436,13 +436,13 @@ class LoadBalancerStatusTree(generic.View):
436 436
     """API for retrieving the resource status tree for a single load balancer.
437 437
 
438 438
     """
439
-    url_regex = r'lbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/statuses/$'
439
+    url_regex = r'nlbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/statuses/$'
440 440
 
441 441
     @rest_utils.ajax()
442 442
     def get(self, request, loadbalancer_id):
443 443
         """Get the status tree for a specific load balancer.
444 444
 
445
-        http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915/statuses
445
+        http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915/statuses
446 446
         """
447 447
         return neutronclient(request).retrieve_loadbalancer_status(
448 448
             loadbalancer_id)
@@ -453,13 +453,13 @@ class LoadBalancer(generic.View):
453 453
     """API for retrieving, updating, and deleting a single load balancer.
454 454
 
455 455
     """
456
-    url_regex = r'lbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/$'
456
+    url_regex = r'nlbaas/loadbalancers/(?P<loadbalancer_id>[^/]+)/$'
457 457
 
458 458
     @rest_utils.ajax()
459 459
     def get(self, request, loadbalancer_id):
460 460
         """Get a specific load balancer.
461 461
 
462
-        http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915
462
+        http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915
463 463
         """
464 464
         loadbalancer = neutronclient(request).show_loadbalancer(
465 465
             loadbalancer_id).get('loadbalancer')
@@ -479,7 +479,7 @@ class LoadBalancer(generic.View):
479 479
     def delete(self, request, loadbalancer_id):
480 480
         """Delete a specific load balancer.
481 481
 
482
-        http://localhost/api/lbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915
482
+        http://localhost/api/nlbaas/loadbalancers/cc758c90-3d98-4ea1-af44-aab405c9c915
483 483
         """
484 484
         neutronclient(request).delete_loadbalancer(loadbalancer_id)
485 485
 
@@ -489,7 +489,7 @@ class Listeners(generic.View):
489 489
     """API for load balancer listeners.
490 490
 
491 491
     """
492
-    url_regex = r'lbaas/listeners/$'
492
+    url_regex = r'nlbaas/listeners/$'
493 493
 
494 494
     @rest_utils.ajax()
495 495
     def get(self, request):
@@ -531,7 +531,7 @@ class Listener(generic.View):
531 531
     """API for retrieving, updating, and deleting a single listener.
532 532
 
533 533
     """
534
-    url_regex = r'lbaas/listeners/(?P<listener_id>[^/]+)/$'
534
+    url_regex = r'nlbaas/listeners/(?P<listener_id>[^/]+)/$'
535 535
 
536 536
     @rest_utils.ajax()
537 537
     def get(self, request, listener_id):
@@ -541,7 +541,7 @@ class Listener(generic.View):
541 541
         the details of all resources that exist under the listener will be
542 542
         returned along with the listener details.
543 543
 
544
-        http://localhost/api/lbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915
544
+        http://localhost/api/nlbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915
545 545
         """
546 546
         listener = neutronclient(request).show_listener(
547 547
             listener_id).get('listener')
@@ -584,7 +584,7 @@ class Listener(generic.View):
584 584
     def delete(self, request, listener_id):
585 585
         """Delete a specific listener.
586 586
 
587
-        http://localhost/api/lbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915
587
+        http://localhost/api/nlbaas/listeners/cc758c90-3d98-4ea1-af44-aab405c9c915
588 588
         """
589 589
         neutronclient(request).delete_listener(listener_id)
590 590
 
@@ -594,7 +594,7 @@ class Pools(generic.View):
594 594
     """API for load balancer pools.
595 595
 
596 596
     """
597
-    url_regex = r'lbaas/pools/$'
597
+    url_regex = r'nlbaas/pools/$'
598 598
 
599 599
     @rest_utils.ajax()
600 600
     def post(self, request):
@@ -613,7 +613,7 @@ class Pool(generic.View):
613 613
     """API for retrieving a single pool.
614 614
 
615 615
     """
616
-    url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)/$'
616
+    url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)/$'
617 617
 
618 618
     @rest_utils.ajax()
619 619
     def get(self, request, pool_id):
@@ -623,7 +623,7 @@ class Pool(generic.View):
623 623
         the details of all resources that exist under the pool will be
624 624
         returned along with the pool details.
625 625
 
626
-        http://localhost/api/lbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915
626
+        http://localhost/api/nlbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915
627 627
         """
628 628
         pool = neutronclient(request).show_lbaas_pool(pool_id).get('pool')
629 629
 
@@ -659,7 +659,7 @@ class Pool(generic.View):
659 659
     def delete(self, request, pool_id):
660 660
         """Delete a specific pool.
661 661
 
662
-        http://localhost/api/lbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915
662
+        http://localhost/api/nlbaas/pools/cc758c90-3d98-4ea1-af44-aab405c9c915
663 663
         """
664 664
         neutronclient(request).delete_lbaas_pool(pool_id)
665 665
 
@@ -669,7 +669,7 @@ class Members(generic.View):
669 669
     """API for load balancer members.
670 670
 
671 671
     """
672
-    url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)/members/$'
672
+    url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)/members/$'
673 673
 
674 674
     @rest_utils.ajax()
675 675
     def get(self, request, pool_id):
@@ -708,7 +708,7 @@ class Member(generic.View):
708 708
     """API for retrieving a single member.
709 709
 
710 710
     """
711
-    url_regex = r'lbaas/pools/(?P<pool_id>[^/]+)' + \
711
+    url_regex = r'nlbaas/pools/(?P<pool_id>[^/]+)' + \
712 712
                 '/members/(?P<member_id>[^/]+)/$'
713 713
 
714 714
     @rest_utils.ajax()
@@ -737,7 +737,7 @@ class HealthMonitors(generic.View):
737 737
     """API for load balancer pool health monitors.
738 738
 
739 739
     """
740
-    url_regex = r'lbaas/healthmonitors/$'
740
+    url_regex = r'nlbaas/healthmonitors/$'
741 741
 
742 742
     @rest_utils.ajax()
743 743
     def post(self, request):
@@ -754,7 +754,7 @@ class HealthMonitor(generic.View):
754 754
     """API for retrieving a single health monitor.
755 755
 
756 756
     """
757
-    url_regex = r'lbaas/healthmonitors/(?P<healthmonitor_id>[^/]+)/$'
757
+    url_regex = r'nlbaas/healthmonitors/(?P<healthmonitor_id>[^/]+)/$'
758 758
 
759 759
     @rest_utils.ajax()
760 760
     def get(self, request, healthmonitor_id):
@@ -768,7 +768,7 @@ class HealthMonitor(generic.View):
768 768
     def delete(self, request, healthmonitor_id):
769 769
         """Delete a specific health monitor.
770 770
 
771
-        http://localhost/api/lbaas/healthmonitors/cc758c90-3d98-4ea1-af44-aab405c9c915
771
+        http://localhost/api/nlbaas/healthmonitors/cc758c90-3d98-4ea1-af44-aab405c9c915
772 772
         """
773 773
         neutronclient(request).delete_lbaas_healthmonitor(healthmonitor_id)
774 774
 

+ 1
- 1
neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/panel.py View File

@@ -24,7 +24,7 @@ LOG = logging.getLogger(__name__)
24 24
 
25 25
 
26 26
 class NGLoadBalancers(horizon.Panel):
27
-    name = _("Load Balancers")
27
+    name = _("Neutron Load Balancers")
28 28
     slug = 'ngloadbalancersv2'
29 29
     permissions = ('openstack.services.network',)
30 30
 

+ 1
- 1
neutron_lbaas_dashboard/dashboards/project/ngloadbalancersv2/views.py View File

@@ -17,4 +17,4 @@ from horizon.views import HorizonTemplateView
17 17
 
18 18
 class IndexView(HorizonTemplateView):
19 19
     template_name = 'project/ngloadbalancersv2/index.html'
20
-    page_title = 'Load Balancers'
20
+    page_title = 'Neutron Load Balancers'

+ 2
- 2
neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py View File

@@ -26,8 +26,8 @@ ADD_PANEL = (
26 26
 
27 27
 ADD_INSTALLED_APPS = ['neutron_lbaas_dashboard']
28 28
 
29
-ADD_ANGULAR_MODULES = ['horizon.dashboard.project.lbaasv2']
29
+ADD_ANGULAR_MODULES = ['horizon.dashboard.project.nlbaasv2']
30 30
 
31
-ADD_SCSS_FILES = ['dashboard/project/lbaasv2/lbaasv2.scss']
31
+ADD_SCSS_FILES = ['dashboard/project/nlbaasv2/nlbaasv2.scss']
32 32
 
33 33
 AUTO_DISCOVER_STATIC_FILES = True

neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.js → neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.js View File

@@ -18,7 +18,7 @@
18 18
 
19 19
   angular
20 20
     .module('horizon.app.core.openstack-service-api')
21
-    .factory('horizon.app.core.openstack-service-api.lbaasv2', lbaasv2API);
21
+    .factory('horizon.app.core.openstack-service-api.nlbaasv2', lbaasv2API);
22 22
 
23 23
   lbaasv2API.$inject = [
24 24
     'horizon.framework.util.http.service',
@@ -68,7 +68,7 @@
68 68
     // Load Balancers
69 69
 
70 70
     /**
71
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancers
71
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancers
72 72
      * @description
73 73
      * Get a list of load balancers.
74 74
      * @param {boolean} full
@@ -78,14 +78,14 @@
78 78
 
79 79
     function getLoadBalancers(full) {
80 80
       var params = { full: full };
81
-      return apiService.get('/api/lbaas/loadbalancers/', { params: params })
81
+      return apiService.get('/api/nlbaas/loadbalancers/', { params: params })
82 82
         .error(function () {
83 83
           toastService.add('error', gettext('Unable to retrieve load balancers.'));
84 84
         });
85 85
     }
86 86
 
87 87
     /**
88
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancer
88
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancer
89 89
      * @description
90 90
      * Get a single load balancer by ID
91 91
      * @param {string} id
@@ -95,14 +95,14 @@
95 95
 
96 96
     function getLoadBalancer(id, full) {
97 97
       var params = { full: full };
98
-      return apiService.get('/api/lbaas/loadbalancers/' + id + '/', { params: params })
98
+      return apiService.get('/api/nlbaas/loadbalancers/' + id + '/', { params: params })
99 99
         .error(function () {
100 100
           toastService.add('error', gettext('Unable to retrieve load balancer.'));
101 101
         });
102 102
     }
103 103
 
104 104
     /**
105
-     * @name horizon.app.core.openstack-service-api.lbaasv2.deleteLoadBalancer
105
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteLoadBalancer
106 106
      * @description
107 107
      * Delete a single load balancer by ID
108 108
      * @param {string} id
@@ -111,14 +111,14 @@
111 111
      */
112 112
 
113 113
     function deleteLoadBalancer(id, quiet) {
114
-      var promise = apiService.delete('/api/lbaas/loadbalancers/' + id + '/');
114
+      var promise = apiService.delete('/api/nlbaas/loadbalancers/' + id + '/');
115 115
       return quiet ? promise : promise.error(function () {
116 116
         toastService.add('error', gettext('Unable to delete load balancer.'));
117 117
       });
118 118
     }
119 119
 
120 120
     /**
121
-     * @name horizon.app.core.openstack-service-api.lbaasv2.createLoadBalancer
121
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.createLoadBalancer
122 122
      * @description
123 123
      * Create a new load balancer
124 124
      * @param {object} spec
@@ -126,14 +126,14 @@
126 126
      */
127 127
 
128 128
     function createLoadBalancer(spec) {
129
-      return apiService.post('/api/lbaas/loadbalancers/', spec)
129
+      return apiService.post('/api/nlbaas/loadbalancers/', spec)
130 130
         .error(function () {
131 131
           toastService.add('error', gettext('Unable to create load balancer.'));
132 132
         });
133 133
     }
134 134
 
135 135
     /**
136
-     * @name horizon.app.core.openstack-service-api.lbaasv2.editLoadBalancer
136
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.editLoadBalancer
137 137
      * @description
138 138
      * Edit a load balancer
139 139
      * @param {string} id
@@ -142,14 +142,14 @@
142 142
      */
143 143
 
144 144
     function editLoadBalancer(id, spec) {
145
-      return apiService.put('/api/lbaas/loadbalancers/' + id + '/', spec)
145
+      return apiService.put('/api/nlbaas/loadbalancers/' + id + '/', spec)
146 146
         .error(function () {
147 147
           toastService.add('error', gettext('Unable to update load balancer.'));
148 148
         });
149 149
     }
150 150
 
151 151
     /**
152
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getLoadBalancerStatusTree
152
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getLoadBalancerStatusTree
153 153
      * @description
154 154
      * Get the status tree for a load balancer
155 155
      * @param {string} id
@@ -157,7 +157,7 @@
157 157
      */
158 158
 
159 159
     function getLoadBalancerStatusTree(id) {
160
-      return apiService.get('/api/lbaas/loadbalancers/' + id + '/statuses/')
160
+      return apiService.get('/api/nlbaas/loadbalancers/' + id + '/statuses/')
161 161
         .error(function () {
162 162
           toastService.add('error', gettext('Unable to retrieve load balancer status tree.'));
163 163
         });
@@ -166,7 +166,7 @@
166 166
     // Listeners
167 167
 
168 168
     /**
169
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getListeners
169
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getListeners
170 170
      * @description
171 171
      * Get the list of listeners.
172 172
      * If a loadbalancer ID is passed as a parameter, the returning list of
@@ -181,14 +181,14 @@
181 181
 
182 182
     function getListeners(id) {
183 183
       var params = id ? {params: {loadbalancerId: id}} : {};
184
-      return apiService.get('/api/lbaas/listeners/', params)
184
+      return apiService.get('/api/nlbaas/listeners/', params)
185 185
         .error(function () {
186 186
           toastService.add('error', gettext('Unable to retrieve listeners.'));
187 187
         });
188 188
     }
189 189
 
190 190
     /**
191
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getListener
191
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getListener
192 192
      * @description
193 193
      * Get a single listener by ID.
194 194
      * @param {string} id
@@ -201,14 +201,14 @@
201 201
       var params = includeChildResources
202 202
           ? {params: {includeChildResources: includeChildResources}}
203 203
           : {};
204
-      return apiService.get('/api/lbaas/listeners/' + id + '/', params)
204
+      return apiService.get('/api/nlbaas/listeners/' + id + '/', params)
205 205
         .error(function () {
206 206
           toastService.add('error', gettext('Unable to retrieve listener.'));
207 207
         });
208 208
     }
209 209
 
210 210
     /**
211
-     * @name horizon.app.core.openstack-service-api.lbaasv2.createListener
211
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.createListener
212 212
      * @description
213 213
      * Create a new listener
214 214
      * @param {object} spec
@@ -216,14 +216,14 @@
216 216
      */
217 217
 
218 218
     function createListener(spec) {
219
-      return apiService.post('/api/lbaas/listeners/', spec)
219
+      return apiService.post('/api/nlbaas/listeners/', spec)
220 220
         .error(function () {
221 221
           toastService.add('error', gettext('Unable to create listener.'));
222 222
         });
223 223
     }
224 224
 
225 225
     /**
226
-     * @name horizon.app.core.openstack-service-api.lbaasv2.editListener
226
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.editListener
227 227
      * @description
228 228
      * Edit a listener
229 229
      * @param {string} id
@@ -233,14 +233,14 @@
233 233
      */
234 234
 
235 235
     function editListener(id, spec) {
236
-      return apiService.put('/api/lbaas/listeners/' + id + '/', spec)
236
+      return apiService.put('/api/nlbaas/listeners/' + id + '/', spec)
237 237
         .error(function () {
238 238
           toastService.add('error', gettext('Unable to update listener.'));
239 239
         });
240 240
     }
241 241
 
242 242
     /**
243
-     * @name horizon.app.core.openstack-service-api.lbaasv2.deleteListener
243
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteListener
244 244
      * @description
245 245
      * Delete a single listener by ID
246 246
      * @param {string} id
@@ -249,7 +249,7 @@
249 249
      */
250 250
 
251 251
     function deleteListener(id, quiet) {
252
-      var promise = apiService.delete('/api/lbaas/listeners/' + id + '/');
252
+      var promise = apiService.delete('/api/nlbaas/listeners/' + id + '/');
253 253
       return quiet ? promise : promise.error(function () {
254 254
         toastService.add('error', gettext('Unable to delete listener.'));
255 255
       });
@@ -258,7 +258,7 @@
258 258
     // Pools
259 259
 
260 260
     /**
261
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getPool
261
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getPool
262 262
      * @description
263 263
      * Get a single Pool by ID.
264 264
      * @param {string} id
@@ -271,14 +271,14 @@
271 271
       var params = includeChildResources
272 272
           ? {params: {includeChildResources: includeChildResources}}
273 273
           : {};
274
-      return apiService.get('/api/lbaas/pools/' + id + '/', params)
274
+      return apiService.get('/api/nlbaas/pools/' + id + '/', params)
275 275
         .error(function () {
276 276
           toastService.add('error', gettext('Unable to retrieve pool.'));
277 277
         });
278 278
     }
279 279
 
280 280
     /**
281
-     * @name horizon.app.core.openstack-service-api.lbaasv2.createPool
281
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.createPool
282 282
      * @description
283 283
      * Create a new pool
284 284
      * @param {object} spec
@@ -286,14 +286,14 @@
286 286
      */
287 287
 
288 288
     function createPool(spec) {
289
-      return apiService.post('/api/lbaas/pools/', spec)
289
+      return apiService.post('/api/nlbaas/pools/', spec)
290 290
         .error(function () {
291 291
           toastService.add('error', gettext('Unable to create pool.'));
292 292
         });
293 293
     }
294 294
 
295 295
     /**
296
-     * @name horizon.app.core.openstack-service-api.lbaasv2.editPool
296
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.editPool
297 297
      * @description
298 298
      * Edit a pool
299 299
      * @param {string} id
@@ -303,14 +303,14 @@
303 303
      */
304 304
 
305 305
     function editPool(id, spec) {
306
-      return apiService.put('/api/lbaas/pools/' + id + '/', spec)
306
+      return apiService.put('/api/nlbaas/pools/' + id + '/', spec)
307 307
         .error(function () {
308 308
           toastService.add('error', gettext('Unable to update pool.'));
309 309
         });
310 310
     }
311 311
 
312 312
     /**
313
-     * @name horizon.app.core.openstack-service-api.lbaasv2.deletePool
313
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.deletePool
314 314
      * @description
315 315
      * Delete a single pool by ID
316 316
      * @param {string} id
@@ -319,7 +319,7 @@
319 319
      */
320 320
 
321 321
     function deletePool(id, quiet) {
322
-      var promise = apiService.delete('/api/lbaas/pools/' + id + '/');
322
+      var promise = apiService.delete('/api/nlbaas/pools/' + id + '/');
323 323
       return quiet ? promise : promise.error(function () {
324 324
         toastService.add('error', gettext('Unable to delete pool.'));
325 325
       });
@@ -328,7 +328,7 @@
328 328
     // Members
329 329
 
330 330
     /**
331
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getMembers
331
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getMembers
332 332
      * @description
333 333
      * Get a list of members.
334 334
      * @param {string} poolId
@@ -339,14 +339,14 @@
339 339
      */
340 340
 
341 341
     function getMembers(poolId) {
342
-      return apiService.get('/api/lbaas/pools/' + poolId + '/members/')
342
+      return apiService.get('/api/nlbaas/pools/' + poolId + '/members/')
343 343
         .error(function () {
344 344
           toastService.add('error', gettext('Unable to retrieve members.'));
345 345
         });
346 346
     }
347 347
 
348 348
     /**
349
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getMember
349
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getMember
350 350
      * @description
351 351
      * Get a single pool Member by ID.
352 352
      * @param {string} poolId
@@ -356,14 +356,14 @@
356 356
      */
357 357
 
358 358
     function getMember(poolId, memberId) {
359
-      return apiService.get('/api/lbaas/pools/' + poolId + '/members/' + memberId + '/')
359
+      return apiService.get('/api/nlbaas/pools/' + poolId + '/members/' + memberId + '/')
360 360
         .error(function () {
361 361
           toastService.add('error', gettext('Unable to retrieve member.'));
362 362
         });
363 363
     }
364 364
 
365 365
     /**
366
-     * @name horizon.app.core.openstack-service-api.lbaasv2.editMember
366
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.editMember
367 367
      * @description
368 368
      * Edit a pool member.
369 369
      * @param {string} id
@@ -373,14 +373,14 @@
373 373
      */
374 374
 
375 375
     function editMember(poolId, memberId, spec) {
376
-      return apiService.put('/api/lbaas/pools/' + poolId + '/members/' + memberId + '/', spec)
376
+      return apiService.put('/api/nlbaas/pools/' + poolId + '/members/' + memberId + '/', spec)
377 377
         .error(function () {
378 378
           toastService.add('error', gettext('Unable to update member.'));
379 379
         });
380 380
     }
381 381
 
382 382
     /**
383
-     * @name horizon.app.core.openstack-service-api.lbaasv2.updateMemberList
383
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.updateMemberList
384 384
      * @description
385 385
      * Update the list of pool members by adding or removing the necessary members.
386 386
      * @param {string} poolId
@@ -390,7 +390,7 @@
390 390
      */
391 391
 
392 392
     function updateMemberList(poolId, spec) {
393
-      return apiService.put('/api/lbaas/pools/' + poolId + '/members/', spec)
393
+      return apiService.put('/api/nlbaas/pools/' + poolId + '/members/', spec)
394 394
         .error(function () {
395 395
           toastService.add('error', gettext('Unable to update member list.'));
396 396
         });
@@ -399,7 +399,7 @@
399 399
     // Health Monitors
400 400
 
401 401
     /**
402
-     * @name horizon.app.core.openstack-service-api.lbaasv2.getHealthMonitor
402
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.getHealthMonitor
403 403
      * @description
404 404
      * Get a single pool health monitor by ID.
405 405
      * @param {string} monitorId
@@ -407,14 +407,14 @@
407 407
      */
408 408
 
409 409
     function getHealthMonitor(monitorId) {
410
-      return apiService.get('/api/lbaas/healthmonitors/' + monitorId + '/')
410
+      return apiService.get('/api/nlbaas/healthmonitors/' + monitorId + '/')
411 411
         .error(function () {
412 412
           toastService.add('error', gettext('Unable to retrieve health monitor.'));
413 413
         });
414 414
     }
415 415
 
416 416
     /**
417
-     * @name horizon.app.core.openstack-service-api.lbaasv2.editHealthMonitor
417
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.editHealthMonitor
418 418
      * @description
419 419
      * Edit a health monitor
420 420
      * @param {string} id
@@ -424,14 +424,14 @@
424 424
      */
425 425
 
426 426
     function editHealthMonitor(id, spec) {
427
-      return apiService.put('/api/lbaas/healthmonitors/' + id + '/', spec)
427
+      return apiService.put('/api/nlbaas/healthmonitors/' + id + '/', spec)
428 428
         .error(function () {
429 429
           toastService.add('error', gettext('Unable to update health monitor.'));
430 430
         });
431 431
     }
432 432
 
433 433
     /**
434
-     * @name horizon.app.core.openstack-service-api.lbaasv2.deleteHealthMonitor
434
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.deleteHealthMonitor
435 435
      * @description
436 436
      * Delete a single health monitor by ID
437 437
      * @param {string} id
@@ -440,14 +440,14 @@
440 440
      */
441 441
 
442 442
     function deleteHealthMonitor(id, quiet) {
443
-      var promise = apiService.delete('/api/lbaas/healthmonitors/' + id + '/');
443
+      var promise = apiService.delete('/api/nlbaas/healthmonitors/' + id + '/');
444 444
       return quiet ? promise : promise.error(function () {
445 445
         toastService.add('error', gettext('Unable to delete health monitor.'));
446 446
       });
447 447
     }
448 448
 
449 449
     /**
450
-     * @name horizon.app.core.openstack-service-api.lbaasv2.createHealthMonitor
450
+     * @name horizon.app.core.openstack-service-api.nlbaasv2.createHealthMonitor
451 451
      * @description
452 452
      * Create a new health monitor
453 453
      * @param {object} spec
@@ -455,7 +455,7 @@
455 455
      */
456 456
 
457 457
     function createHealthMonitor(spec) {
458
-      return apiService.post('/api/lbaas/healthmonitors/', spec)
458
+      return apiService.post('/api/nlbaas/healthmonitors/', spec)
459 459
         .error(function () {
460 460
           toastService.add('error', gettext('Unable to create health monitor.'));
461 461
         });

neutron_lbaas_dashboard/static/app/core/openstack-service-api/lbaasv2.service.spec.js → neutron_lbaas_dashboard/static/app/core/openstack-service-api/nlbaasv2.service.spec.js View File

@@ -27,7 +27,7 @@
27 27
 
28 28
     beforeEach(module('horizon.app.core.openstack-service-api'));
29 29
 
30
-    beforeEach(inject(['horizon.app.core.openstack-service-api.lbaasv2', function(lbaasv2API) {
30
+    beforeEach(inject(['horizon.app.core.openstack-service-api.nlbaasv2', function(lbaasv2API) {
31 31
       service = lbaasv2API;
32 32
     }]));
33 33
 
@@ -39,7 +39,7 @@
39 39
       {
40 40
         func: 'getLoadBalancers',
41 41
         method: 'get',
42
-        path: '/api/lbaas/loadbalancers/',
42
+        path: '/api/nlbaas/loadbalancers/',
43 43
         error: 'Unable to retrieve load balancers.',
44 44
         testInput: [ true ],
45 45
         data: { params: { full: true } }
@@ -47,7 +47,7 @@
47 47
       {
48 48
         func: 'getLoadBalancer',
49 49
         method: 'get',
50
-        path: '/api/lbaas/loadbalancers/1234/',
50
+        path: '/api/nlbaas/loadbalancers/1234/',
51 51
         error: 'Unable to retrieve load balancer.',
52 52
         testInput: [ '1234', true ],
53 53
         data: { params: { full: true } }
@@ -55,21 +55,21 @@
55 55
       {
56 56
         func: 'deleteLoadBalancer',
57 57
         method: 'delete',
58
-        path: '/api/lbaas/loadbalancers/1234/',
58
+        path: '/api/nlbaas/loadbalancers/1234/',
59 59
         error: 'Unable to delete load balancer.',
60 60
         testInput: [ '1234' ]
61 61
       },
62 62
       {
63 63
         func: 'getLoadBalancerStatusTree',
64 64
         method: 'get',
65
-        path: '/api/lbaas/loadbalancers/1234/statuses/',
65
+        path: '/api/nlbaas/loadbalancers/1234/statuses/',
66 66
         error: 'Unable to retrieve load balancer status tree.',
67 67
         testInput: [ '1234' ]
68 68
       },
69 69
       {
70 70
         func: 'getListeners',
71 71
         method: 'get',
72
-        path: '/api/lbaas/listeners/',
72
+        path: '/api/nlbaas/listeners/',
73 73
         error: 'Unable to retrieve listeners.',
74 74
         testInput: [ '1234' ],
75 75
         data: { params: { loadbalancerId: '1234' } }
@@ -77,14 +77,14 @@
77 77
       {
78 78
         func: 'getListeners',
79 79
         method: 'get',
80
-        path: '/api/lbaas/listeners/',
80
+        path: '/api/nlbaas/listeners/',
81 81
         data: {},
82 82
         error: 'Unable to retrieve listeners.'
83 83
       },
84 84
       {
85 85
         func: 'getListener',
86 86
         method: 'get',
87
-        path: '/api/lbaas/listeners/1234/',
87
+        path: '/api/nlbaas/listeners/1234/',
88 88
         data: { params: { includeChildResources: true } },
89 89
         error: 'Unable to retrieve listener.',
90 90
         testInput: [ '1234', true ]
@@ -92,7 +92,7 @@
92 92
       {
93 93
         func: 'getListener',
94 94
         method: 'get',
95
-        path: '/api/lbaas/listeners/1234/',
95
+        path: '/api/nlbaas/listeners/1234/',
96 96
         data: {},
97 97
         error: 'Unable to retrieve listener.',
98 98
         testInput: [ '1234', false ]
@@ -100,7 +100,7 @@
100 100
       {
101 101
         func: 'getPool',
102 102
         method: 'get',
103
-        path: '/api/lbaas/pools/1234/',
103
+        path: '/api/nlbaas/pools/1234/',
104 104
         data: { params: { includeChildResources: true } },
105 105
         error: 'Unable to retrieve pool.',
106 106
         testInput: [ '1234', true ]
@@ -108,7 +108,7 @@
108 108
       {
109 109
         func: 'getPool',
110 110
         method: 'get',
111
-        path: '/api/lbaas/pools/1234/',
111
+        path: '/api/nlbaas/pools/1234/',
112 112
         data: {},
113 113
         error: 'Unable to retrieve pool.',
114 114
         testInput: [ '1234', false ]
@@ -116,28 +116,28 @@
116 116
       {
117 117
         func: 'deletePool',
118 118
         method: 'delete',
119
-        path: '/api/lbaas/pools/1234/',
119
+        path: '/api/nlbaas/pools/1234/',
120 120
         error: 'Unable to delete pool.',
121 121
         testInput: [ '1234' ]
122 122
       },
123 123
       {
124 124
         func: 'getMembers',
125 125
         method: 'get',
126
-        path: '/api/lbaas/pools/1234/members/',
126
+        path: '/api/nlbaas/pools/1234/members/',
127 127
         error: 'Unable to retrieve members.',
128 128
         testInput: [ '1234' ]
129 129
       },
130 130
       {
131 131
         func: 'getMember',
132 132
         method: 'get',
133
-        path: '/api/lbaas/pools/1234/members/5678/',
133
+        path: '/api/nlbaas/pools/1234/members/5678/',
134 134
         error: 'Unable to retrieve member.',
135 135
         testInput: [ '1234', '5678' ]
136 136
       },
137 137
       {
138 138
         func: 'editMember',
139 139
         method: 'put',
140
-        path: '/api/lbaas/pools/1234/members/5678/',
140
+        path: '/api/nlbaas/pools/1234/members/5678/',
141 141
         error: 'Unable to update member.',
142 142
         data: { weight: 2 },
143 143
         testInput: [ '1234', '5678', { weight: 2 } ]
@@ -145,14 +145,14 @@
145 145
       {
146 146
         func: 'getHealthMonitor',
147 147
         method: 'get',
148
-        path: '/api/lbaas/healthmonitors/1234/',
148
+        path: '/api/nlbaas/healthmonitors/1234/',
149 149
         error: 'Unable to retrieve health monitor.',
150 150
         testInput: [ '1234' ]
151 151
       },
152 152
       {
153 153
         func: 'editHealthMonitor',
154 154
         method: 'put',
155
-        path: '/api/lbaas/healthmonitors/1234/',
155
+        path: '/api/nlbaas/healthmonitors/1234/',
156 156
         error: 'Unable to update health monitor.',
157 157
         data: { name: 'healthmonitor-1' },
158 158
         testInput: [ '1234', { name: 'healthmonitor-1' } ]
@@ -160,14 +160,14 @@
160 160
       {
161 161
         func: 'deleteHealthMonitor',
162 162
         method: 'delete',
163
-        path: '/api/lbaas/healthmonitors/1234/',
163
+        path: '/api/nlbaas/healthmonitors/1234/',
164 164
         error: 'Unable to delete health monitor.',
165 165
         testInput: [ '1234' ]
166 166
       },
167 167
       {
168 168
         func: 'createLoadBalancer',
169 169
         method: 'post',
170
-        path: '/api/lbaas/loadbalancers/',
170
+        path: '/api/nlbaas/loadbalancers/',
171 171
         error: 'Unable to create load balancer.',
172 172
         data: { name: 'loadbalancer-1' },
173 173
         testInput: [ { name: 'loadbalancer-1' } ]
@@ -175,7 +175,7 @@
175 175
       {
176 176
         func: 'editLoadBalancer',
177 177
         method: 'put',
178
-        path: '/api/lbaas/loadbalancers/1234/',
178
+        path: '/api/nlbaas/loadbalancers/1234/',
179 179
         error: 'Unable to update load balancer.',
180 180
         data: { name: 'loadbalancer-1' },
181 181
         testInput: [ '1234', { name: 'loadbalancer-1' } ]
@@ -183,7 +183,7 @@
183 183
       {
184 184
         func: 'createListener',
185 185
         method: 'post',
186
-        path: '/api/lbaas/listeners/',
186
+        path: '/api/nlbaas/listeners/',
187 187
         error: 'Unable to create listener.',
188 188
         data: { name: 'listener-1' },
189 189
         testInput: [ { name: 'listener-1' } ]
@@ -191,7 +191,7 @@
191 191
       {
192 192
         func: 'editListener',
193 193
         method: 'put',
194
-        path: '/api/lbaas/listeners/1234/',
194
+        path: '/api/nlbaas/listeners/1234/',
195 195
         error: 'Unable to update listener.',
196 196
         data: { name: 'listener-1' },
197 197
         testInput: [ '1234', { name: 'listener-1' } ]
@@ -199,14 +199,14 @@
199 199
       {
200 200
         func: 'deleteListener',
201 201
         method: 'delete',
202
-        path: '/api/lbaas/listeners/1234/',
202
+        path: '/api/nlbaas/listeners/1234/',
203 203
         error: 'Unable to delete listener.',
204 204
         testInput: [ '1234' ]
205 205
       },
206 206
       {
207 207
         func: 'createPool',
208 208
         method: 'post',
209
-        path: '/api/lbaas/pools/',
209
+        path: '/api/nlbaas/pools/',
210 210
         error: 'Unable to create pool.',
211 211
         data: { name: 'pool-1' },
212 212
         testInput: [ { name: 'pool-1' } ]
@@ -214,7 +214,7 @@
214 214
       {
215 215
         func: 'editPool',
216 216
         method: 'put',
217
-        path: '/api/lbaas/pools/1234/',
217
+        path: '/api/nlbaas/pools/1234/',
218 218
         error: 'Unable to update pool.',
219 219
         data: { name: 'pool-1' },
220 220
         testInput: [ '1234', { name: 'pool-1' } ]
@@ -222,7 +222,7 @@
222 222
       {
223 223
         func: 'createHealthMonitor',
224 224
         method: 'post',
225
-        path: '/api/lbaas/healthmonitors/',
225
+        path: '/api/nlbaas/healthmonitors/',
226 226
         error: 'Unable to create health monitor.',
227 227
         data: { name: 'healthmonitor-1' },
228 228
         testInput: [ { name: 'healthmonitor-1' } ]
@@ -230,7 +230,7 @@
230 230
       {
231 231
         func: 'updateMemberList',
232 232
         method: 'put',
233
-        path: '/api/lbaas/pools/1234/members/',
233
+        path: '/api/nlbaas/pools/1234/members/',
234 234
         error: 'Unable to update member list.',
235 235
         data: { name: 'member-1' },
236 236
         testInput: [ '1234', { name: 'member-1' } ]

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.js View File

@@ -17,13 +17,13 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors')
21
-    .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.create', createService);
20
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21
+    .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create', createService);
22 22
 
23 23
   createService.$inject = [
24 24
     '$q',
25 25
     '$location',
26
-    'horizon.dashboard.project.lbaasv2.workflow.modal',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.modal',
27 27
     'horizon.app.core.openstack-service-api.policy',
28 28
     'horizon.framework.util.i18n.gettext',
29 29
     'horizon.framework.util.q.extensions'
@@ -31,7 +31,7 @@
31 31
 
32 32
   /**
33 33
    * @ngDoc factory
34
-   * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.createService
34
+   * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.createService
35 35
    * @description
36 36
    * Provides the service for creating a health monitor resource.
37 37
    * @param $q The angular service for promises.
@@ -47,7 +47,7 @@
47 47
     var loadbalancerId, listenerId, poolId, statePromise;
48 48
 
49 49
     var create = workflowModal.init({
50
-      controller: 'CreateHealthMonitorWizardController',
50
+      controller: 'nLBaaSCreateHealthMonitorWizardController',
51 51
       message: gettext('A new health monitor is being created.'),
52 52
       handle: onCreate,
53 53
       allowed: allowed

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/create.action.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/create.action.service.spec.js View File

@@ -38,7 +38,7 @@
38 38
     beforeEach(module('horizon.framework.conf'));
39 39
     beforeEach(module('horizon.framework.widgets'));
40 40
     beforeEach(module('horizon.app.core.openstack-service-api'));
41
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
41
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
42 42
 
43 43
     beforeEach(module(function($provide) {
44 44
       $provide.value('$uibModal', {
@@ -59,7 +59,7 @@
59 59
       $q = $injector.get('$q');
60 60
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
61 61
       $location = $injector.get('$location');
62
-      service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.create');
62
+      service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.create');
63 63
       init = service.init;
64 64
       loadBalancerState = $q.defer();
65 65
     }));

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.js View File

@@ -17,14 +17,14 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors')
21
-    .controller('CreateHealthMonitorWizardController', CreateHealthMonitorWizardController);
20
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21
+    .controller('nLBaaSCreateHealthMonitorWizardController', CreateHealthMonitorWizardController);
22 22
 
23 23
   CreateHealthMonitorWizardController.$inject = [
24 24
     '$scope',
25 25
     '$routeParams',
26
-    'horizon.dashboard.project.lbaasv2.workflow.model',
27
-    'horizon.dashboard.project.lbaasv2.workflow.workflow',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.model',
27
+    'horizon.dashboard.project.nlbaasv2.workflow.workflow',
28 28
     'horizon.framework.util.i18n.gettext'
29 29
   ];
30 30
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/create/wizard.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/create/wizard.controller.spec.js View File

@@ -32,14 +32,14 @@
32 32
     };
33 33
 
34 34
     beforeEach(module('horizon.framework.util'));
35
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
35
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
36 36
     beforeEach(module(function ($provide) {
37
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
38
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
37
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
38
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
39 39
     }));
40 40
     beforeEach(inject(function ($controller) {
41 41
       spyOn(model, 'initialize');
42
-      ctrl = $controller('CreateHealthMonitorWizardController', { $scope: scope });
42
+      ctrl = $controller('nLBaaSCreateHealthMonitorWizardController', { $scope: scope });
43 43
     }));
44 44
 
45 45
     it('defines the controller', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.js View File

@@ -17,22 +17,22 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors')
21
-    .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete', deleteService);
20
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21
+    .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete', deleteService);
22 22
 
23 23
   deleteService.$inject = [
24 24
     '$q',
25 25
     '$location',
26 26
     '$route',
27 27
     'horizon.framework.widgets.modal.deleteModalService',
28
-    'horizon.app.core.openstack-service-api.lbaasv2',
28
+    'horizon.app.core.openstack-service-api.nlbaasv2',
29 29
     'horizon.app.core.openstack-service-api.policy',
30 30
     'horizon.framework.util.i18n.gettext'
31 31
   ];
32 32
 
33 33
   /**
34 34
    * @ngDoc factory
35
-   * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.deleteService
35
+   * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.deleteService
36 36
    * @description
37 37
    * Brings up the delete health monitor confirmation modal dialog.
38 38
    * On submit, deletes selected health monitor.

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/delete/delete.action.service.spec.js View File

@@ -52,7 +52,7 @@
52 52
     beforeEach(module('horizon.framework.conf'));
53 53
     beforeEach(module('horizon.framework.widgets'));
54 54
     beforeEach(module('horizon.app.core.openstack-service-api'));
55
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
55
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
56 56
 
57 57
     beforeEach(function() {
58 58
       monitor = { id: '1', name: 'HealthMonitor1' };
@@ -66,7 +66,7 @@
66 66
           };
67 67
         }
68 68
       });
69
-      $provide.value('horizon.app.core.openstack-service-api.lbaasv2', {
69
+      $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', {
70 70
         deleteHealthMonitor: function() {
71 71
           return makePromise();
72 72
         }
@@ -80,13 +80,13 @@
80 80
 
81 81
     beforeEach(inject(function ($injector) {
82 82
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
83
-      lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
83
+      lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
84 84
       modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
85 85
       $scope = $injector.get('$rootScope').$new();
86 86
       $location = $injector.get('$location');
87 87
       $q = $injector.get('$q');
88 88
       toast = $injector.get('horizon.framework.widgets.toast.service');
89
-      service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete');
89
+      service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete');
90 90
       service.init('1', '2', '3', isActionable('active'));
91 91
       $scope.$apply();
92 92
     }));

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.js View File

@@ -17,20 +17,20 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors')
21
-    .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit', editService);
20
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21
+    .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit', editService);
22 22
 
23 23
   editService.$inject = [
24 24
     '$q',
25 25
     '$route',
26
-    'horizon.dashboard.project.lbaasv2.workflow.modal',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.modal',
27 27
     'horizon.app.core.openstack-service-api.policy',
28 28
     'horizon.framework.util.i18n.gettext'
29 29
   ];
30 30
 
31 31
   /**
32 32
    * @ngDoc factory
33
-   * @name horizon.dashboard.project.lbaasv2.healthmonitors.actions.editService
33
+   * @name horizon.dashboard.project.nlbaasv2.healthmonitors.actions.editService
34 34
    * @description
35 35
    * Provides the service for editing a health monitor resource.
36 36
    * @param $q The angular service for promises.
@@ -45,7 +45,7 @@
45 45
     var statePromise;
46 46
 
47 47
     var edit = workflowModal.init({
48
-      controller: 'EditHealthMonitorWizardController',
48
+      controller: 'nLBaaSEditHealthMonitorWizardController',
49 49
       message: gettext('The health monitor has been updated.'),
50 50
       handle: handle,
51 51
       allowed: allowed

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/edit.action.service.spec.js View File

@@ -38,7 +38,7 @@
38 38
     beforeEach(module('horizon.framework.conf'));
39 39
     beforeEach(module('horizon.framework.widgets'));
40 40
     beforeEach(module('horizon.app.core.openstack-service-api'));
41
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
41
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
42 42
 
43 43
     beforeEach(module(function($provide) {
44 44
       $provide.value('$uibModal', {
@@ -59,7 +59,7 @@
59 59
       $q = $injector.get('$q');
60 60
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
61 61
       $route = $injector.get('$route');
62
-      service = $injector.get('horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit');
62
+      service = $injector.get('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit');
63 63
       init = service.init;
64 64
       loadBalancerState = $q.defer();
65 65
     }));

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.js View File

@@ -17,13 +17,13 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors')
21
-    .controller('EditHealthMonitorWizardController', EditHealthMonitorWizardController);
20
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21
+    .controller('nLBaaSEditHealthMonitorWizardController', EditHealthMonitorWizardController);
22 22
 
23 23
   EditHealthMonitorWizardController.$inject = [
24 24
     '$scope',
25
-    'horizon.dashboard.project.lbaasv2.workflow.model',
26
-    'horizon.dashboard.project.lbaasv2.workflow.workflow',
25
+    'horizon.dashboard.project.nlbaasv2.workflow.model',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.workflow',
27 27
     'horizon.framework.util.i18n.gettext'
28 28
   ];
29 29
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/edit/wizard.controller.spec.js View File

@@ -32,14 +32,14 @@
32 32
     };
33 33
 
34 34
     beforeEach(module('horizon.framework.util'));
35
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
35
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
36 36
     beforeEach(module(function ($provide) {
37
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
38
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
37
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
38
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
39 39
     }));
40 40
     beforeEach(inject(function ($controller) {
41 41
       spyOn(model, 'initialize');
42
-      ctrl = $controller('EditHealthMonitorWizardController', { $scope: scope });
42
+      ctrl = $controller('nLBaaSEditHealthMonitorWizardController', { $scope: scope });
43 43
     }));
44 44
 
45 45
     it('defines the controller', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.js View File

@@ -17,20 +17,20 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors')
21
-    .factory('horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions',
20
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21
+    .factory('horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions',
22 22
       rowActions);
23 23
 
24 24
   rowActions.$inject = [
25 25
     'horizon.framework.util.i18n.gettext',
26
-    'horizon.dashboard.project.lbaasv2.loadbalancers.service',
27
-    'horizon.dashboard.project.lbaasv2.healthmonitors.actions.edit',
28
-    'horizon.dashboard.project.lbaasv2.healthmonitors.actions.delete'
26
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
27
+    'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.edit',
28
+    'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.delete'
29 29
   ];
30 30
 
31 31
   /**
32 32
    * @ngdoc service
33
-   * @ngname horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions
33
+   * @ngname horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions
34 34
    *
35 35
    * @description
36 36
    * Provides the service for the health monitor row actions.

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/actions/row-actions.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/actions/row-actions.service.spec.js View File

@@ -23,14 +23,14 @@
23 23
     beforeEach(module('horizon.framework.conf'));
24 24
     beforeEach(module('horizon.framework.widgets'));
25 25
     beforeEach(module('horizon.app.core.openstack-service-api'));
26
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
26
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
27 27
 
28 28
     beforeEach(inject(function ($injector) {
29 29
       var rowActionsService = $injector.get(
30
-        'horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions');
30
+        'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions');
31 31
       actions = rowActionsService.init('1', '2', '3').actions();
32 32
       var loadbalancerService = $injector.get(
33
-          'horizon.dashboard.project.lbaasv2.loadbalancers.service');
33
+          'horizon.dashboard.project.nlbaasv2.loadbalancers.service');
34 34
       spyOn(loadbalancerService, 'isActionable').and.returnValue(true);
35 35
     }));
36 36
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.js View File

@@ -17,12 +17,12 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors')
21
-    .controller('HealthMonitorDetailController', HealthMonitorDetailController);
20
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors')
21
+    .controller('nLBaaSHealthMonitorDetailController', HealthMonitorDetailController);
22 22
 
23 23
   HealthMonitorDetailController.$inject = [
24
-    'horizon.app.core.openstack-service-api.lbaasv2',
25
-    'horizon.dashboard.project.lbaasv2.healthmonitors.actions.rowActions',
24
+    'horizon.app.core.openstack-service-api.nlbaasv2',
25
+    'horizon.dashboard.project.nlbaasv2.healthmonitors.actions.rowActions',
26 26
     '$routeParams',
27 27
     '$q'
28 28
   ];

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.controller.spec.js View File

@@ -45,7 +45,7 @@
45 45
     }
46 46
 
47 47
     function createController() {
48
-      return $controller('HealthMonitorDetailController', {
48
+      return $controller('nLBaaSHealthMonitorDetailController', {
49 49
         $routeParams: {
50 50
           loadbalancerId: 'loadbalancerId',
51 51
           listenerId: 'listenerId',
@@ -61,7 +61,7 @@
61 61
     beforeEach(module('horizon.framework.widgets'));
62 62
     beforeEach(module('horizon.framework.conf'));
63 63
     beforeEach(module('horizon.app.core.openstack-service-api'));
64
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
64
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
65 65
 
66 66
     beforeEach(module(function($provide) {
67 67
       apiFail = false;
@@ -71,7 +71,7 @@
71 71
     }));
72 72
 
73 73
     beforeEach(inject(function($injector) {
74
-      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
74
+      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
75 75
       spyOn(lbaasv2API, 'getHealthMonitor').and.callFake(fakeAPI);
76 76
       spyOn(lbaasv2API, 'getPool').and.callFake(fakeAPI);
77 77
       spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
@@ -79,7 +79,7 @@
79 79
       $controller = $injector.get('$controller');
80 80
     }));
81 81
 
82
-    it('should invoke lbaasv2 apis', function() {
82
+    it('should invoke nlbaasv2 apis', function() {
83 83
       var ctrl = createController();
84 84
       expect(lbaasv2API.getHealthMonitor).toHaveBeenCalledWith('healthmonitorId');
85 85
       expect(lbaasv2API.getPool).toHaveBeenCalledWith('poolId');

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/detail.html → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/detail.html View File

@@ -1,5 +1,5 @@
1
-<div ng-controller="HealthMonitorDetailController as ctrl">
2
-  <detail-status loading="ctrl.loading" error="ctrl.error"></detail-status>
1
+<div ng-controller="nLBaaSHealthMonitorDetailController as ctrl">
2
+  <nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
3 3
   <div ng-if="!ctrl.loading && !ctrl.error">
4 4
     <div class="page-header">
5 5
       <ol class="breadcrumb">
@@ -39,4 +39,4 @@
39 39
       </div>
40 40
     </div>
41 41
   </div>
42
-</div>
42
+</div>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.js View File

@@ -18,7 +18,7 @@
18 18
 
19 19
   /**
20 20
    * @ngdoc overview
21
-   * @ngname horizon.dashboard.project.lbaasv2.healthmonitors
21
+   * @ngname horizon.dashboard.project.nlbaasv2.healthmonitors
22 22
    *
23 23
    * @description
24 24
    * Provides the services and widgets required to support and display the project healthmonitors
@@ -26,6 +26,6 @@
26 26
    */
27 27
 
28 28
   angular
29
-    .module('horizon.dashboard.project.lbaasv2.healthmonitors', []);
29
+    .module('horizon.dashboard.project.nlbaasv2.healthmonitors', []);
30 30
 
31 31
 })();

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/healthmonitors/healthmonitors.module.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/healthmonitors/healthmonitors.module.spec.js View File

@@ -18,7 +18,7 @@
18 18
 
19 19
   describe('LBaaS v2 Healthmonitors Module', function() {
20 20
     it('should exist', function() {
21
-      expect(angular.module('horizon.dashboard.project.lbaasv2.healthmonitors')).toBeDefined();
21
+      expect(angular.module('horizon.dashboard.project.nlbaasv2.healthmonitors')).toBeDefined();
22 22
     });
23 23
   });
24 24
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.js View File

@@ -17,23 +17,23 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.listeners')
21
-    .factory('horizon.dashboard.project.lbaasv2.listeners.actions.batchActions',
20
+    .module('horizon.dashboard.project.nlbaasv2.listeners')
21
+    .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions',
22 22
       tableBatchActions);
23 23
 
24 24
   tableBatchActions.$inject = [
25 25
     '$q',
26 26
     '$location',
27
-    'horizon.dashboard.project.lbaasv2.workflow.modal',
27
+    'horizon.dashboard.project.nlbaasv2.workflow.modal',
28 28
     'horizon.app.core.openstack-service-api.policy',
29 29
     'horizon.framework.util.i18n.gettext',
30
-    'horizon.dashboard.project.lbaasv2.loadbalancers.service',
31
-    'horizon.dashboard.project.lbaasv2.listeners.actions.delete'
30
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
31
+    'horizon.dashboard.project.nlbaasv2.listeners.actions.delete'
32 32
   ];
33 33
 
34 34
   /**
35 35
    * @ngdoc service
36
-   * @ngname horizon.dashboard.project.lbaasv2.listeners.actions.batchActions
36
+   * @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions
37 37
    *
38 38
    * @description
39 39
    * Provides the service for the Listeners table batch actions.
@@ -54,7 +54,7 @@
54 54
     var loadBalancerIsActionable, loadBalancerId;
55 55
 
56 56
     var create = workflowModal.init({
57
-      controller: 'CreateListenerWizardController',
57
+      controller: 'nLBaaSCreateListenerWizardController',
58 58
       message: gettext('A new listener is being created.'),
59 59
       handle: onCreate,
60 60
       allowed: canCreate

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/batch-actions.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/batch-actions.service.spec.js View File

@@ -23,7 +23,7 @@
23 23
     beforeEach(module('horizon.framework.conf'));
24 24
     beforeEach(module('horizon.framework.widgets'));
25 25
     beforeEach(module('horizon.app.core.openstack-service-api'));
26
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
26
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
27 27
 
28 28
     beforeEach(module(function($provide) {
29 29
       var response = {
@@ -43,7 +43,7 @@
43 43
         }
44 44
       };
45 45
       $provide.value('$uibModal', modal);
46
-      $provide.value('horizon.dashboard.project.lbaasv2.loadbalancers.service', {
46
+      $provide.value('horizon.dashboard.project.nlbaasv2.loadbalancers.service', {
47 47
         isActionable: function() {
48 48
           return $q.when();
49 49
         }
@@ -61,7 +61,7 @@
61 61
       $q = $injector.get('$q');
62 62
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
63 63
       var batchActionsService = $injector.get(
64
-        'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions');
64
+        'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions');
65 65
       actions = batchActionsService.init('1234').actions();
66 66
       $scope.$apply();
67 67
     }));

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.js View File

@@ -17,14 +17,14 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.listeners')
21
-    .controller('CreateListenerWizardController', CreateListenerWizardController);
20
+    .module('horizon.dashboard.project.nlbaasv2.listeners')
21
+    .controller('nLBaaSCreateListenerWizardController', CreateListenerWizardController);
22 22
 
23 23
   CreateListenerWizardController.$inject = [
24 24
     '$scope',
25 25
     '$routeParams',
26
-    'horizon.dashboard.project.lbaasv2.workflow.model',
27
-    'horizon.dashboard.project.lbaasv2.workflow.workflow',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.model',
27
+    'horizon.dashboard.project.nlbaasv2.workflow.workflow',
28 28
     'horizon.framework.util.i18n.gettext'
29 29
   ];
30 30
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/create/wizard.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/create/wizard.controller.spec.js View File

@@ -30,14 +30,14 @@
30 30
     var scope = {};
31 31
 
32 32
     beforeEach(module('horizon.framework.util'));
33
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
33
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
34 34
     beforeEach(module(function ($provide) {
35
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
36
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
35
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
36
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
37 37
     }));
38 38
     beforeEach(inject(function ($controller) {
39 39
       spyOn(model, 'initialize');
40
-      ctrl = $controller('CreateListenerWizardController', { $scope: scope });
40
+      ctrl = $controller('nLBaaSCreateListenerWizardController', { $scope: scope });
41 41
     }));
42 42
 
43 43
     it('defines the controller', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.js View File

@@ -17,15 +17,15 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.listeners')
21
-    .factory('horizon.dashboard.project.lbaasv2.listeners.actions.delete', deleteService);
20
+    .module('horizon.dashboard.project.nlbaasv2.listeners')
21
+    .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.delete', deleteService);
22 22
 
23 23
   deleteService.$inject = [
24 24
     '$q',
25 25
     '$location',
26 26
     '$route',
27 27
     'horizon.framework.widgets.modal.deleteModalService',
28
-    'horizon.app.core.openstack-service-api.lbaasv2',
28
+    'horizon.app.core.openstack-service-api.nlbaasv2',
29 29
     'horizon.app.core.openstack-service-api.policy',
30 30
     'horizon.framework.widgets.toast.service',
31 31
     'horizon.framework.util.q.extensions',
@@ -34,7 +34,7 @@
34 34
 
35 35
   /**
36 36
    * @ngDoc factory
37
-   * @name horizon.dashboard.project.lbaasv2.listeners.actions.deleteService
37
+   * @name horizon.dashboard.project.nlbaasv2.listeners.actions.deleteService
38 38
    * @description
39 39
    * Brings up the delete listeners confirmation modal dialog.
40 40
    * On submit, deletes selected listeners.

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/delete/delete.action.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/delete/delete.action.service.spec.js View File

@@ -43,7 +43,7 @@
43 43
     beforeEach(module('horizon.framework.conf'));
44 44
     beforeEach(module('horizon.framework.widgets'));
45 45
     beforeEach(module('horizon.app.core.openstack-service-api'));
46
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
46
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
47 47
 
48 48
     beforeEach(function() {
49 49
       items = [{ id: '1', name: 'First' },
@@ -58,7 +58,7 @@
58 58
           };
59 59
         }
60 60
       });
61
-      $provide.value('horizon.app.core.openstack-service-api.lbaasv2', {
61
+      $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', {
62 62
         deleteListener: function() {
63 63
           return makePromise();
64 64
         }
@@ -72,14 +72,14 @@
72 72
 
73 73
     beforeEach(inject(function ($injector) {
74 74
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
75
-      lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
75
+      lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
76 76
       modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
77 77
       $scope = $injector.get('$rootScope').$new();
78 78
       $route = $injector.get('$route');
79 79
       $location = $injector.get('$location');
80 80
       $q = $injector.get('$q');
81 81
       toast = $injector.get('horizon.framework.widgets.toast.service');
82
-      service = $injector.get('horizon.dashboard.project.lbaasv2.listeners.actions.delete');
82
+      service = $injector.get('horizon.dashboard.project.nlbaasv2.listeners.actions.delete');
83 83
       service.init('1', makePromise());
84 84
     }));
85 85
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.js View File

@@ -17,14 +17,14 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .controller('EditListenerWizardController', EditListenerWizardController);
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .controller('nLBaaSEditListenerWizardController', EditListenerWizardController);
22 22
 
23 23
   EditListenerWizardController.$inject = [
24 24
     '$scope',
25 25
     '$q',
26
-    'horizon.dashboard.project.lbaasv2.workflow.model',
27
-    'horizon.dashboard.project.lbaasv2.workflow.workflow',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.model',
27
+    'horizon.dashboard.project.nlbaasv2.workflow.workflow',
28 28
     'horizon.framework.util.i18n.gettext'
29 29
   ];
30 30
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/edit/wizard.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/edit/wizard.controller.spec.js View File

@@ -36,18 +36,18 @@
36 36
     };
37 37
 
38 38
     beforeEach(module('horizon.framework.util'));
39
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
39
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
40 40
     beforeEach(module(function ($provide) {
41 41
       workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
42
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
43
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy);
42
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
43
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy);
44 44
     }));
45 45
     beforeEach(inject(function ($controller, $injector) {
46 46
       $q = $injector.get('$q');
47 47
       scope = $injector.get('$rootScope').$new();
48 48
       scope.launchContext = { id: '1234' };
49 49
       spyOn(model, 'initialize').and.callThrough();
50
-      ctrl = $controller('EditListenerWizardController', { $scope: scope });
50
+      ctrl = $controller('nLBaaSEditListenerWizardController', { $scope: scope });
51 51
     }));
52 52
 
53 53
     it('defines the controller', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.js View File

@@ -17,24 +17,24 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.listeners')
21
-    .factory('horizon.dashboard.project.lbaasv2.listeners.actions.rowActions',
20
+    .module('horizon.dashboard.project.nlbaasv2.listeners')
21
+    .factory('horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
22 22
       tableRowActions);
23 23
 
24 24
   tableRowActions.$inject = [
25 25
     '$q',
26 26
     '$route',
27
-    'horizon.dashboard.project.lbaasv2.workflow.modal',
27
+    'horizon.dashboard.project.nlbaasv2.workflow.modal',
28 28
     'horizon.app.core.openstack-service-api.policy',
29 29
     'horizon.framework.util.i18n.gettext',
30
-    'horizon.dashboard.project.lbaasv2.loadbalancers.service',
31
-    'horizon.dashboard.project.lbaasv2.listeners.actions.delete',
32
-    'horizon.dashboard.project.lbaasv2.pools.actions.create'
30
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
31
+    'horizon.dashboard.project.nlbaasv2.listeners.actions.delete',
32
+    'horizon.dashboard.project.nlbaasv2.pools.actions.create'
33 33
   ];
34 34
 
35 35
   /**
36 36
    * @ngdoc service
37
-   * @ngname horizon.dashboard.project.lbaasv2.listeners.actions.rowActions
37
+   * @ngname horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions
38 38
    *
39 39
    * @description
40 40
    * Provides the service for the Listener table row actions.
@@ -57,7 +57,7 @@
57 57
     var loadbalancerId, loadBalancerIsActionable;
58 58
 
59 59
     var edit = workflowModal.init({
60
-      controller: 'EditListenerWizardController',
60
+      controller: 'nLBaaSEditListenerWizardController',
61 61
       message: gettext('The listener has been updated.'),
62 62
       handle: onEdit,
63 63
       allowed: canEdit

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/actions/row-actions.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/actions/row-actions.service.spec.js View File

@@ -45,7 +45,7 @@
45 45
     beforeEach(module('horizon.framework.conf'));
46 46
     beforeEach(module('horizon.framework.widgets'));
47 47
     beforeEach(module('horizon.app.core.openstack-service-api'));
48
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
48
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
49 49
 
50 50
     beforeEach(module(function($provide) {
51 51
       var response = {
@@ -73,11 +73,11 @@
73 73
       $route = $injector.get('$route');
74 74
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
75 75
       var rowActionsService = $injector.get(
76
-        'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions');
76
+        'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions');
77 77
       actions = rowActionsService.actions();
78 78
       init = rowActionsService.init;
79 79
       var loadbalancerService = $injector.get(
80
-          'horizon.dashboard.project.lbaasv2.loadbalancers.service');
80
+          'horizon.dashboard.project.nlbaasv2.loadbalancers.service');
81 81
       spyOn(loadbalancerService, 'isActionable').and.callFake(isActionableMock);
82 82
     }));
83 83
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.js View File

@@ -17,12 +17,12 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.listeners')
21
-    .controller('ListenerDetailController', ListenerDetailController);
20
+    .module('horizon.dashboard.project.nlbaasv2.listeners')
21
+    .controller('nLBaaSListenerDetailController', ListenerDetailController);
22 22
 
23 23
   ListenerDetailController.$inject = [
24
-    'horizon.app.core.openstack-service-api.lbaasv2',
25
-    'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions',
24
+    'horizon.app.core.openstack-service-api.nlbaasv2',
25
+    'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
26 26
     '$routeParams',
27 27
     '$q'
28 28
   ];

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.controller.spec.js View File

@@ -45,7 +45,7 @@
45 45
     }
46 46
 
47 47
     function createController() {
48
-      return $controller('ListenerDetailController', {
48
+      return $controller('nLBaaSListenerDetailController', {
49 49
         $routeParams: {
50 50
           loadbalancerId: 'loadbalancerId',
51 51
           listenerId: 'listenerId'
@@ -59,7 +59,7 @@
59 59
     beforeEach(module('horizon.framework.widgets'));
60 60
     beforeEach(module('horizon.framework.conf'));
61 61
     beforeEach(module('horizon.app.core.openstack-service-api'));
62
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
62
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
63 63
 
64 64
     beforeEach(module(function($provide) {
65 65
       apiFail = false;
@@ -70,13 +70,13 @@
70 70
     }));
71 71
 
72 72
     beforeEach(inject(function($injector) {
73
-      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
73
+      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
74 74
       spyOn(lbaasv2API, 'getListener').and.callFake(fakeAPI);
75 75
       spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(loadbalancerAPI);
76 76
       $controller = $injector.get('$controller');
77 77
     }));
78 78
 
79
-    it('should invoke lbaasv2 apis', function() {
79
+    it('should invoke nlbaasv2 apis', function() {
80 80
       var ctrl = createController();
81 81
       expect(lbaasv2API.getListener).toHaveBeenCalledWith('listenerId');
82 82
       expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('loadbalancerId');

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/detail.html → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/detail.html View File

@@ -1,5 +1,5 @@
1
-<div ng-controller="ListenerDetailController as ctrl">
2
-  <detail-status loading="ctrl.loading" error="ctrl.error"></detail-status>
1
+<div ng-controller="nLBaaSListenerDetailController as ctrl">
2
+  <nlbaas-detail-status loading="ctrl.loading" error="ctrl.error"></nlbaas-detail-status>
3 3
   <div ng-if="!ctrl.loading && !ctrl.error">
4 4
     <div class="page-header">
5 5
       <ol class="breadcrumb">
@@ -39,4 +39,4 @@
39 39
       </div>
40 40
     </div>
41 41
   </div>
42
-</div>
42
+</div>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.js View File

@@ -18,7 +18,7 @@
18 18
 
19 19
   /**
20 20
    * @ngdoc overview
21
-   * @ngname horizon.dashboard.project.lbaasv2.listeners
21
+   * @ngname horizon.dashboard.project.nlbaasv2.listeners
22 22
    *
23 23
    * @description
24 24
    * Provides the services and widgets required to support and display the project listeners
@@ -26,6 +26,6 @@
26 26
    */
27 27
 
28 28
   angular
29
-    .module('horizon.dashboard.project.lbaasv2.listeners', []);
29
+    .module('horizon.dashboard.project.nlbaasv2.listeners', []);
30 30
 
31 31
 })();

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/listeners.module.spec.js View File

@@ -18,7 +18,7 @@
18 18
 
19 19
   describe('LBaaS v2 Listeners Module', function() {
20 20
     it('should exist', function() {
21
-      expect(angular.module('horizon.dashboard.project.lbaasv2.listeners')).toBeDefined();
21
+      expect(angular.module('horizon.dashboard.project.nlbaasv2.listeners')).toBeDefined();
22 22
     });
23 23
   });
24 24
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.js View File

@@ -17,14 +17,14 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.listeners')
21
-    .controller('ListenersTableController', ListenersTableController);
20
+    .module('horizon.dashboard.project.nlbaasv2.listeners')
21
+    .controller('nLBaaSListenersTableController', ListenersTableController);
22 22
 
23 23
   ListenersTableController.$inject = [
24
-    'horizon.app.core.openstack-service-api.lbaasv2',
24
+    'horizon.app.core.openstack-service-api.nlbaasv2',
25 25
     '$routeParams',
26
-    'horizon.dashboard.project.lbaasv2.listeners.actions.rowActions',
27
-    'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions'
26
+    'horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions',
27
+    'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions'
28 28
   ];
29 29
 
30 30
   /**

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.controller.spec.js View File

@@ -43,24 +43,24 @@
43 43
     beforeEach(module('horizon.framework.conf'));
44 44
     beforeEach(module('horizon.framework.util'));
45 45
     beforeEach(module('horizon.app.core.openstack-service-api'));
46
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
46
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
47 47
 
48 48
     beforeEach(module(function($provide) {
49 49
       $provide.value('$uibModal', {});
50 50
     }));
51 51
 
52 52
     beforeEach(inject(function($injector) {
53
-      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
53
+      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
54 54
       controller = $injector.get('$controller');
55
-      rowActions = $injector.get('horizon.dashboard.project.lbaasv2.listeners.actions.rowActions');
55
+      rowActions = $injector.get('horizon.dashboard.project.nlbaasv2.listeners.actions.rowActions');
56 56
       batchActions = $injector.get(
57
-          'horizon.dashboard.project.lbaasv2.listeners.actions.batchActions');
57
+          'horizon.dashboard.project.nlbaasv2.listeners.actions.batchActions');
58 58
       spyOn(rowActions, 'init').and.callFake(initMock);
59 59
       spyOn(lbaasv2API, 'getListeners').and.callFake(fakeAPI);
60 60
     }));
61 61
 
62 62
     function createController() {
63
-      return controller('ListenersTableController', {
63
+      return controller('nLBaaSListenersTableController', {
64 64
         $routeParams: { loadbalancerId: '1234' }
65 65
       });
66 66
     }
@@ -80,7 +80,7 @@
80 80
       expect(ctrl.batchActions).toEqual(batchActions);
81 81
     });
82 82
 
83
-    it('should invoke lbaasv2 apis', function() {
83
+    it('should invoke nlbaasv2 apis', function() {
84 84
       var ctrl = createController();
85 85
       expect(lbaasv2API.getListeners).toHaveBeenCalled();
86 86
       expect(ctrl.src.length).toBe(1);

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/listeners/table.html → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/listeners/table.html View File

@@ -1,4 +1,4 @@
1
-<table ng-controller="ListenersTableController as table"
1
+<table ng-controller="nLBaaSListenersTableController as table"
2 2
        hz-table ng-cloak
3 3
        st-table="table.items"
4 4
        st-safe-src="table.src"
@@ -112,7 +112,7 @@
112 112
       </td>
113 113
     </tr>
114 114
 
115
-    <tr table-status table="table" column-count="7"></tr>
115
+    <tr nlbaas-table-status table="table" column-count="7"></tr>
116 116
 
117 117
   </tbody>
118 118
   <!--
@@ -121,4 +121,4 @@
121 121
   -->
122 122
   <tfoot hz-table-footer items="table.items"></tfoot>
123 123
 
124
-</table>
124
+</table>

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.js View File

@@ -17,8 +17,8 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .controller('AssociateFloatingIpModalController', AssociateFloatingIpModalController);
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .controller('nLBaaSAssociateFloatingIpModalController', AssociateFloatingIpModalController);
22 22
 
23 23
   AssociateFloatingIpModalController.$inject = [
24 24
     '$uibModalInstance',

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.controller.spec.js View File

@@ -21,7 +21,7 @@
21 21
     var associateFail = false;
22 22
 
23 23
     beforeEach(module('horizon.framework.util.i18n'));
24
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
24
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
25 25
 
26 26
     beforeEach(function() {
27 27
       floatingIps = [{ id: 'ip1', ip: '1', fixed_ip: '1' },
@@ -68,14 +68,14 @@
68 68
     }));
69 69
 
70 70
     it('should define controller properties', function() {
71
-      ctrl = $controller('AssociateFloatingIpModalController');
71
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
72 72
       expect(ctrl.cancel).toBeDefined();
73 73
       expect(ctrl.save).toBeDefined();
74 74
       expect(ctrl.saving).toBe(false);
75 75
     });
76 76
 
77 77
     it('should initialize options', function() {
78
-      ctrl = $controller('AssociateFloatingIpModalController');
78
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
79 79
       expect(ctrl.options.length).toBe(2);
80 80
       expect(ctrl.options[0].id).toBe('ip2');
81 81
       expect(ctrl.options[1].id).toBe('pool1');
@@ -84,7 +84,7 @@
84 84
     it('should use ids instead of ip or name if not provided', function() {
85 85
       delete floatingIps[1].ip;
86 86
       delete floatingIpPools[0].name;
87
-      ctrl = $controller('AssociateFloatingIpModalController');
87
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
88 88
       expect(ctrl.options.length).toBe(2);
89 89
       expect(ctrl.options[0].name).toBe('ip2');
90 90
       expect(ctrl.options[1].name).toBe('pool1');
@@ -92,19 +92,19 @@
92 92
 
93 93
     it('should initialize selected option when only one option', function() {
94 94
       floatingIps[1].fixed_ip = '2';
95
-      ctrl = $controller('AssociateFloatingIpModalController');
95
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
96 96
       expect(ctrl.options.length).toBe(1);
97 97
       expect(ctrl.selected).toBe(ctrl.options[0]);
98 98
     });
99 99
 
100 100
     it('should not initialize selected option when more than one option', function() {
101
-      ctrl = $controller('AssociateFloatingIpModalController');
101
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
102 102
       expect(ctrl.options.length).toBe(2);
103 103
       expect(ctrl.selected).toBeNull();
104 104
     });
105 105
 
106 106
     it('should associate floating IP if floating IP selected', function() {
107
-      ctrl = $controller('AssociateFloatingIpModalController');
107
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
108 108
       ctrl.selected = ctrl.options[0];
109 109
       spyOn(network, 'associateFloatingIp').and.callThrough();
110 110
       spyOn($uibModalInstance, 'close');
@@ -115,7 +115,7 @@
115 115
     });
116 116
 
117 117
     it('should allocate floating IP if floating IP pool selected', function() {
118
-      ctrl = $controller('AssociateFloatingIpModalController');
118
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
119 119
       ctrl.selected = ctrl.options[1];
120 120
       spyOn(network, 'allocateFloatingIp').and.callThrough();
121 121
       spyOn(network, 'associateFloatingIp').and.callThrough();
@@ -128,14 +128,14 @@
128 128
     });
129 129
 
130 130
     it('should dismiss modal if cancel clicked', function() {
131
-      ctrl = $controller('AssociateFloatingIpModalController');
131
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
132 132
       spyOn($uibModalInstance, 'dismiss');
133 133
       ctrl.cancel();
134 134
       expect($uibModalInstance.dismiss).toHaveBeenCalledWith('cancel');
135 135
     });
136 136
 
137 137
     it('should not dismiss modal if save fails', function() {
138
-      ctrl = $controller('AssociateFloatingIpModalController');
138
+      ctrl = $controller('nLBaaSAssociateFloatingIpModalController');
139 139
       ctrl.selected = ctrl.options[0];
140 140
       associateFail = true;
141 141
       spyOn($uibModalInstance, 'dismiss');

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.html → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.html View File


neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.js View File

@@ -17,15 +17,15 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service',
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service',
22 22
       modalService);
23 23
 
24 24
   modalService.$inject = [
25 25
     '$q',
26 26
     '$uibModal',
27 27
     '$route',
28
-    'horizon.dashboard.project.lbaasv2.basePath',
28
+    'horizon.dashboard.project.nlbaasv2.basePath',
29 29
     'horizon.app.core.openstack-service-api.policy',
30 30
     'horizon.app.core.openstack-service-api.network',
31 31
     'horizon.framework.util.q.extensions',
@@ -35,7 +35,7 @@
35 35
 
36 36
   /**
37 37
    * @ngdoc service
38
-   * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service
38
+   * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service
39 39
    *
40 40
    * @description
41 41
    * Provides the service for the Load Balancer Associate Floating IP action.
@@ -96,7 +96,7 @@
96 96
     function open(item) {
97 97
       var spec = {
98 98
         backdrop: 'static',
99
-        controller: 'AssociateFloatingIpModalController as modal',
99
+        controller: 'nLBaaSAssociateFloatingIpModalController as modal',
100 100
         templateUrl: basePath + 'loadbalancers/actions/associate-ip/modal.html',
101 101
         resolve: {
102 102
           loadbalancer: function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/associate-ip/modal.service.spec.js View File

@@ -38,7 +38,7 @@
38 38
     beforeEach(module('horizon.framework.conf'));
39 39
     beforeEach(module('horizon.framework.widgets'));
40 40
     beforeEach(module('horizon.app.core.openstack-service-api'));
41
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
41
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
42 42
 
43 43
     beforeEach(function() {
44 44
       item = { id: '1', name: 'First', floating_ip: {} };
@@ -76,7 +76,7 @@
76 76
       $route = $injector.get('$route');
77 77
       $uibModal = $injector.get('$uibModal');
78 78
       service = $injector.get(
79
-        'horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service');
79
+        'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service');
80 80
     }));
81 81
 
82 82
     it('should have the "allowed" and "perform" functions', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.js View File

@@ -17,29 +17,29 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions',
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions',
22 22
       tableBatchActions);
23 23
 
24 24
   tableBatchActions.$inject = [
25 25
     '$location',
26
-    'horizon.dashboard.project.lbaasv2.workflow.modal',
27
-    'horizon.dashboard.project.lbaasv2.basePath',
28
-    'horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.modal',
27
+    'horizon.dashboard.project.nlbaasv2.basePath',
28
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete',
29 29
     'horizon.app.core.openstack-service-api.policy',
30 30
     'horizon.framework.util.i18n.gettext'
31 31
   ];
32 32
 
33 33
   /**
34 34
    * @ngdoc service
35
-   * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions
35
+   * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions
36 36
    *
37 37
    * @description
38 38
    * Provides the service for the Load Balancers table batch actions.
39 39
    *
40 40
    * @param $location The angular $location service.
41 41
    * @param workflowModal The LBaaS workflow modal service.
42
-   * @param basePath The lbaasv2 module base path.
42
+   * @param basePath The nlbaasv2 module base path.
43 43
    * @param deleteService The load balancer delete service.
44 44
    * @param policy The horizon policy service.
45 45
    * @param gettext The horizon gettext function for translation.
@@ -49,7 +49,7 @@
49 49
   function tableBatchActions($location, workflowModal, basePath, deleteService, policy, gettext) {
50 50
 
51 51
     var create = workflowModal.init({
52
-      controller: 'CreateLoadBalancerWizardController',
52
+      controller: 'nLBaaSCreateLoadBalancerWizardController',
53 53
       message: gettext('A new load balancer is being created.'),
54 54
       handle: onCreate,
55 55
       allowed: canCreate

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/batch-actions.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/batch-actions.service.spec.js View File

@@ -23,7 +23,7 @@
23 23
     beforeEach(module('horizon.framework.conf'));
24 24
     beforeEach(module('horizon.framework.widgets'));
25 25
     beforeEach(module('horizon.app.core.openstack-service-api'));
26
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
26
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
27 27
 
28 28
     beforeEach(module(function($provide) {
29 29
       var response = {
@@ -49,7 +49,7 @@
49 49
       $location = $injector.get('$location');
50 50
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
51 51
       var batchActionsService = $injector.get(
52
-        'horizon.dashboard.project.lbaasv2.loadbalancers.actions.batchActions');
52
+        'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.batchActions');
53 53
       actions = batchActionsService.actions();
54 54
     }));
55 55
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.js View File

@@ -17,13 +17,13 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .controller('CreateLoadBalancerWizardController', CreateLoadBalancerWizardController);
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .controller('nLBaaSCreateLoadBalancerWizardController', CreateLoadBalancerWizardController);
22 22
 
23 23
   CreateLoadBalancerWizardController.$inject = [
24 24
     '$scope',
25
-    'horizon.dashboard.project.lbaasv2.workflow.model',
26
-    'horizon.dashboard.project.lbaasv2.workflow.workflow',
25
+    'horizon.dashboard.project.nlbaasv2.workflow.model',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.workflow',
27 27
     'horizon.framework.util.i18n.gettext'
28 28
   ];
29 29
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/create/wizard.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/create/wizard.controller.spec.js View File

@@ -30,14 +30,14 @@
30 30
     var scope = {};
31 31
 
32 32
     beforeEach(module('horizon.framework.util'));
33
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
33
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
34 34
     beforeEach(module(function ($provide) {
35
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
36
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflow);
35
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
36
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflow);
37 37
     }));
38 38
     beforeEach(inject(function ($controller) {
39 39
       spyOn(model, 'initialize');
40
-      ctrl = $controller('CreateLoadBalancerWizardController', { $scope: scope });
40
+      ctrl = $controller('nLBaaSCreateLoadBalancerWizardController', { $scope: scope });
41 41
     }));
42 42
 
43 43
     it('defines the controller', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.js View File

@@ -17,15 +17,15 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete', deleteService);
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete', deleteService);
22 22
 
23 23
   deleteService.$inject = [
24 24
     '$q',
25 25
     '$location',
26 26
     '$route',
27 27
     'horizon.framework.widgets.modal.deleteModalService',
28
-    'horizon.app.core.openstack-service-api.lbaasv2',
28
+    'horizon.app.core.openstack-service-api.nlbaasv2',
29 29
     'horizon.app.core.openstack-service-api.policy',
30 30
     'horizon.framework.widgets.toast.service',
31 31
     'horizon.framework.util.q.extensions',
@@ -34,7 +34,7 @@
34 34
 
35 35
   /**
36 36
    * @ngDoc factory
37
-   * @name horizon.dashboard.project.lbaasv2.loadbalancers.actions.deleteService
37
+   * @name horizon.dashboard.project.nlbaasv2.loadbalancers.actions.deleteService
38 38
    * @description
39 39
    * Brings up the delete load balancers confirmation modal dialog.
40 40
    * On submit, deletes selected load balancers.

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/delete/delete.action.service.spec.js View File

@@ -43,7 +43,7 @@
43 43
     beforeEach(module('horizon.framework.conf'));
44 44
     beforeEach(module('horizon.framework.widgets'));
45 45
     beforeEach(module('horizon.app.core.openstack-service-api'));
46
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
46
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
47 47
 
48 48
     beforeEach(function() {
49 49
       items = [{ id: '1', name: 'First', provisioning_status: 'ACTIVE' },
@@ -58,7 +58,7 @@
58 58
           };
59 59
         }
60 60
       });
61
-      $provide.value('horizon.app.core.openstack-service-api.lbaasv2', {
61
+      $provide.value('horizon.app.core.openstack-service-api.nlbaasv2', {
62 62
         deleteLoadBalancer: function() {
63 63
           return makePromise();
64 64
         }
@@ -72,14 +72,14 @@
72 72
 
73 73
     beforeEach(inject(function ($injector) {
74 74
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
75
-      lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
75
+      lbaasv2Api = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
76 76
       modal = $injector.get('horizon.framework.widgets.modal.deleteModalService');
77 77
       $scope = $injector.get('$rootScope').$new();
78 78
       $route = $injector.get('$route');
79 79
       $location = $injector.get('$location');
80 80
       $q = $injector.get('$q');
81 81
       toast = $injector.get('horizon.framework.widgets.toast.service');
82
-      service = $injector.get('horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete');
82
+      service = $injector.get('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete');
83 83
     }));
84 84
 
85 85
     it('should have the "allowed" and "perform" functions', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.js View File

@@ -17,9 +17,9 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21 21
     .factory(
22
-      'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service',
22
+      'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service',
23 23
       modalService);
24 24
 
25 25
   modalService.$inject = [
@@ -34,7 +34,7 @@
34 34
 
35 35
   /**
36 36
    * @ngDoc factory
37
-   * @name horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service
37
+   * @name horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service
38 38
    * @description
39 39
    * Brings up the disassociate floating IP confirmation modal dialog.
40 40
    * On submit, dsiassociates the floating IP address from the load balancer.

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/disassociate-ip/modal.service.spec.js View File

@@ -38,7 +38,7 @@
38 38
     beforeEach(module('horizon.framework.conf'));
39 39
     beforeEach(module('horizon.framework.widgets'));
40 40
     beforeEach(module('horizon.app.core.openstack-service-api'));
41
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
41
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
42 42
 
43 43
     beforeEach(function() {
44 44
       item = { id: '1', name: 'First', floating_ip: { id: 'ip1', ip: '1' } };
@@ -71,7 +71,7 @@
71 71
       $scope = $injector.get('$rootScope').$new();
72 72
       $route = $injector.get('$route');
73 73
       service = $injector.get(
74
-        'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service');
74
+        'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service');
75 75
     }));
76 76
 
77 77
     it('should have the "allowed" and "perform" functions', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.js View File

@@ -17,13 +17,13 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .controller('EditLoadBalancerWizardController', EditLoadBalancerWizardController);
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .controller('nLBaaSEditLoadBalancerWizardController', EditLoadBalancerWizardController);
22 22
 
23 23
   EditLoadBalancerWizardController.$inject = [
24 24
     '$scope',
25
-    'horizon.dashboard.project.lbaasv2.workflow.model',
26
-    'horizon.dashboard.project.lbaasv2.workflow.workflow',
25
+    'horizon.dashboard.project.nlbaasv2.workflow.model',
26
+    'horizon.dashboard.project.nlbaasv2.workflow.workflow',
27 27
     'horizon.framework.util.i18n.gettext'
28 28
   ];
29 29
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/edit/wizard.controller.spec.js View File

@@ -30,15 +30,15 @@
30 30
     };
31 31
 
32 32
     beforeEach(module('horizon.framework.util'));
33
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
33
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
34 34
     beforeEach(module(function ($provide) {
35 35
       workflowSpy = jasmine.createSpy('workflow').and.returnValue(workflow);
36
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.model', model);
37
-      $provide.value('horizon.dashboard.project.lbaasv2.workflow.workflow', workflowSpy);
36
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.model', model);
37
+      $provide.value('horizon.dashboard.project.nlbaasv2.workflow.workflow', workflowSpy);
38 38
     }));
39 39
     beforeEach(inject(function ($controller) {
40 40
       spyOn(model, 'initialize');
41
-      ctrl = $controller('EditLoadBalancerWizardController', { $scope: scope });
41
+      ctrl = $controller('nLBaaSEditLoadBalancerWizardController', { $scope: scope });
42 42
     }));
43 43
 
44 44
     it('defines the controller', function() {

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.js View File

@@ -17,17 +17,17 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .factory('horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions',
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .factory('horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions',
22 22
       tableRowActions);
23 23
 
24 24
   tableRowActions.$inject = [
25 25
     '$q',
26 26
     '$route',
27
-    'horizon.dashboard.project.lbaasv2.workflow.modal',
28
-    'horizon.dashboard.project.lbaasv2.loadbalancers.actions.delete',
29
-    'horizon.dashboard.project.lbaasv2.loadbalancers.actions.associate-ip.modal.service',
30
-    'horizon.dashboard.project.lbaasv2.loadbalancers.actions.disassociate-ip.modal.service',
27
+    'horizon.dashboard.project.nlbaasv2.workflow.modal',
28
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.delete',
29
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.associate-ip.modal.service',
30
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.disassociate-ip.modal.service',
31 31
     'horizon.app.core.openstack-service-api.policy',
32 32
     'horizon.app.core.openstack-service-api.network',
33 33
     'horizon.framework.util.q.extensions',
@@ -36,7 +36,7 @@
36 36
 
37 37
   /**
38 38
    * @ngdoc service
39
-   * @ngname horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions
39
+   * @ngname horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions
40 40
    *
41 41
    * @description
42 42
    * Provides the service for the Load Balancers table row actions.
@@ -67,7 +67,7 @@
67 67
     gettext
68 68
   ) {
69 69
     var edit = workflowModal.init({
70
-      controller: 'EditLoadBalancerWizardController',
70
+      controller: 'nLBaaSEditLoadBalancerWizardController',
71 71
       message: gettext('The load balancer has been updated.'),
72 72
       handle: onEdit,
73 73
       allowed: canEdit

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/actions/row-actions.service.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/actions/row-actions.service.spec.js View File

@@ -37,7 +37,7 @@
37 37
     beforeEach(module('horizon.framework.conf'));
38 38
     beforeEach(module('horizon.framework.widgets'));
39 39
     beforeEach(module('horizon.app.core.openstack-service-api'));
40
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
40
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
41 41
 
42 42
     beforeEach(module(function($provide) {
43 43
       var response = {
@@ -64,7 +64,7 @@
64 64
       $route = $injector.get('$route');
65 65
       policy = $injector.get('horizon.app.core.openstack-service-api.policy');
66 66
       rowActionsService = $injector.get(
67
-        'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions');
67
+        'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions');
68 68
       actions = rowActionsService.actions();
69 69
     }));
70 70
 

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.js View File

@@ -17,13 +17,13 @@
17 17
   'use strict';
18 18
 
19 19
   angular
20
-    .module('horizon.dashboard.project.lbaasv2.loadbalancers')
21
-    .controller('LoadBalancerDetailController', LoadBalancerDetailController);
20
+    .module('horizon.dashboard.project.nlbaasv2.loadbalancers')
21
+    .controller('nLBaaSLoadBalancerDetailController', LoadBalancerDetailController);
22 22
 
23 23
   LoadBalancerDetailController.$inject = [
24
-    'horizon.app.core.openstack-service-api.lbaasv2',
25
-    'horizon.dashboard.project.lbaasv2.loadbalancers.actions.rowActions',
26
-    'horizon.dashboard.project.lbaasv2.loadbalancers.service',
24
+    'horizon.app.core.openstack-service-api.nlbaasv2',
25
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.actions.rowActions',
26
+    'horizon.dashboard.project.nlbaasv2.loadbalancers.service',
27 27
     '$routeParams',
28 28
     '$window',
29 29
     '$scope'

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.controller.spec.js → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.controller.spec.js View File

@@ -32,7 +32,7 @@
32 32
     }
33 33
 
34 34
     function createController() {
35
-      return $controller('LoadBalancerDetailController', {
35
+      return $controller('nLBaaSLoadBalancerDetailController', {
36 36
         $scope: $scope,
37 37
         $window: $window,
38 38
         $routeParams: { loadbalancerId: '1234' }
@@ -45,7 +45,7 @@
45 45
     beforeEach(module('horizon.framework.conf'));
46 46
     beforeEach(module('horizon.framework.util'));
47 47
     beforeEach(module('horizon.app.core.openstack-service-api'));
48
-    beforeEach(module('horizon.dashboard.project.lbaasv2'));
48
+    beforeEach(module('horizon.dashboard.project.nlbaasv2'));
49 49
 
50 50
     beforeEach(module(function($provide) {
51 51
       apiFail = false;
@@ -53,14 +53,14 @@
53 53
     }));
54 54
 
55 55
     beforeEach(inject(function($injector) {
56
-      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.lbaasv2');
56
+      lbaasv2API = $injector.get('horizon.app.core.openstack-service-api.nlbaasv2');
57 57
       spyOn(lbaasv2API, 'getLoadBalancer').and.callFake(fakeAPI);
58 58
       $scope = $injector.get('$rootScope').$new();
59 59
       $window = {};
60 60
       $controller = $injector.get('$controller');
61 61
     }));
62 62
 
63
-    it('should invoke lbaasv2 apis', function() {
63
+    it('should invoke nlbaasv2 apis', function() {
64 64
       createController();
65 65
       expect(lbaasv2API.getLoadBalancer).toHaveBeenCalledWith('1234', true);
66 66
     });

neutron_lbaas_dashboard/static/dashboard/project/lbaasv2/loadbalancers/detail.html → neutron_lbaas_dashboard/static/dashboard/project/nlbaasv2/loadbalancers/detail.html