magnum-ui 13.0.0__py3-none-any.whl → 14.0.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,7 +12,7 @@
12
12
  # License for the specific language governing permissions and limitations
13
13
  # under the License.
14
14
 
15
- from django.utils.translation import ugettext_lazy as _
15
+ from django.utils.translation import gettext_lazy as _
16
16
  import horizon
17
17
 
18
18
 
@@ -13,7 +13,7 @@
13
13
  # under the License.
14
14
 
15
15
  from django.urls import re_path
16
- from django.utils.translation import ugettext_lazy as _
16
+ from django.utils.translation import gettext_lazy as _
17
17
  from horizon.browsers import views
18
18
  from magnum_ui.content.cluster_templates import panel
19
19
 
@@ -12,7 +12,7 @@
12
12
  # License for the specific language governing permissions and limitations
13
13
  # under the License.
14
14
 
15
- from django.utils.translation import ugettext_lazy as _
15
+ from django.utils.translation import gettext_lazy as _
16
16
  import horizon
17
17
 
18
18
  # DO NOT REMOVE
@@ -13,7 +13,7 @@
13
13
  # under the License.
14
14
 
15
15
  from django.urls import re_path
16
- from django.utils.translation import ugettext_lazy as _
16
+ from django.utils.translation import gettext_lazy as _
17
17
  from horizon.browsers import views
18
18
  from magnum_ui.content.clusters import panel
19
19
 
@@ -10,7 +10,7 @@
10
10
  # License for the specific language governing permissions and limitations
11
11
  # under the License.
12
12
 
13
- from django.utils.translation import ugettext_lazy as _
13
+ from django.utils.translation import gettext_lazy as _
14
14
 
15
15
  import horizon
16
16
 
@@ -11,7 +11,7 @@
11
11
  # under the License.
12
12
 
13
13
  from django.urls import re_path
14
- from django.utils.translation import ugettext_lazy as _
14
+ from django.utils.translation import gettext_lazy as _
15
15
 
16
16
  from horizon.browsers import views
17
17
 
@@ -11,7 +11,7 @@
11
11
  # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12
12
  # License for the specific language governing permissions and limitations
13
13
  # under the License.
14
- from django.utils.translation import ugettext_lazy as _
14
+ from django.utils.translation import gettext_lazy as _
15
15
 
16
16
  # The slug of the panel group to be added to HORIZON_CONFIG. Required.
17
17
  PANEL_GROUP = 'container_infra'
@@ -9,7 +9,7 @@
9
9
  # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
10
10
  # License for the specific language governing permissions and limitations
11
11
  # under the License.
12
- from django.utils.translation import ugettext_lazy as _
12
+ from django.utils.translation import gettext_lazy as _
13
13
 
14
14
  # The slug of the panel group to be added to HORIZON_CONFIG. Required.
15
15
  PANEL_GROUP = 'container_infra'
@@ -31,12 +31,18 @@
31
31
  var result = service.getClusterTemplatesPromise({});
32
32
  deferred.resolve({
33
33
  data:{
34
- items: [{id: 123, name: 'template1'}]
34
+ items: [
35
+ {id: 123, name: 'template1', updated_at: '2020-01-01'},
36
+ {id: 456, name: 'template2', created_at: '2021-12-12'},
37
+ ]
35
38
  }
36
39
  });
37
40
  $timeout.flush();
38
41
  expect(magnum.getClusterTemplates).toHaveBeenCalled();
39
42
  expect(result.$$state.value.data.items[0].name).toBe('template1');
43
+ expect(result.$$state.value.data.items[0].trackBy).toBe('1232020-01-01');
44
+ expect(result.$$state.value.data.items[1].name).toBe('template2');
45
+ expect(result.$$state.value.data.items[1].trackBy).toBe('4562021-12-12');
40
46
  }));
41
47
  });
42
48
 
@@ -112,6 +112,7 @@
112
112
 
113
113
  if (!model.create_network) {
114
114
  addFieldToRequestObjectIfSet('fixed_network','fixed_network');
115
+ addFieldToRequestObjectIfSet('fixed_subnet','fixed_subnet');
115
116
  }
116
117
  // Labels processing order (the following overrides previous):
117
118
  // Cluster Templates -> Create Form -> User-defined in 'labels' textarea
@@ -52,6 +52,7 @@
52
52
  function init(title, $scope) {
53
53
  var schema, form;
54
54
 
55
+ var fixedSubnetsInitial = gettext('Choose an existing subnet');
55
56
  // Default <option>s; will be shown in selector as a placeholder
56
57
  var templateTitleMap = [{value: '', name: gettext('Choose a Cluster Template') }];
57
58
  var availabilityZoneTitleMap = [{value: '',
@@ -62,6 +63,7 @@
62
63
  var workerFlavorTitleMap = [{value: '',
63
64
  name: gettext('Choose a Flavor for the Worker Node')}];
64
65
  var networkTitleMap = [{value: '', name: gettext('Choose an existing network')}];
66
+ var subnetTitleMap = [{value: '', name: fixedSubnetsInitial}];
65
67
  var ingressTitleMap = [{value: '', name: gettext('Choose an ingress controller')}];
66
68
 
67
69
  var addonsTitleMap = [];
@@ -102,6 +104,7 @@
102
104
  'master_lb_enabled': {type: 'boolean'},
103
105
  'create_network': { type: 'boolean' },
104
106
  'fixed_network': { type: 'string' },
107
+ 'fixed_subnet': { type: 'string' },
105
108
  'floating_ip_enabled': { type: 'boolean' },
106
109
  'ingress_controller': { type: 'object' },
107
110
 
@@ -332,6 +335,7 @@
332
335
  onChange: function(isNewNetwork) {
333
336
  if (isNewNetwork) {
334
337
  model.fixed_network = MODEL_DEFAULTS.fixed_network;
338
+ model.fixed_subnet = MODEL_DEFAULTS.fixed_subnet;
335
339
  }
336
340
  }
337
341
  },
@@ -341,6 +345,17 @@
341
345
  title: gettext('Use an Existing Network'),
342
346
  titleMap: networkTitleMap,
343
347
  condition: 'model.create_network === false',
348
+ required: true,
349
+ onChange: function () {
350
+ changeFixedNetwork(model);
351
+ }
352
+ },
353
+ {
354
+ key: 'fixed_subnet',
355
+ type: 'select',
356
+ title: gettext('Use an Existing Subnet'),
357
+ titleMap: subnetTitleMap,
358
+ condition: 'model.create_network === false',
344
359
  required: true
345
360
  }
346
361
  ]
@@ -486,6 +501,7 @@
486
501
  master_lb_enabled: false,
487
502
  create_network: true,
488
503
  fixed_network: '',
504
+ fixed_subnet: '',
489
505
  floating_ip_enabled: false,
490
506
  ingress_controller: '',
491
507
 
@@ -570,12 +586,33 @@
570
586
 
571
587
  function onGetNetworks(response) {
572
588
  angular.forEach(response.data.items, function(network) {
573
- networkTitleMap.push({value: network.id, name: network.name + ' (' + network.id + ')'});
589
+ networkTitleMap.push({
590
+ value: network.id,
591
+ name: network.name + ' (' + network.id + ')',
592
+ subnets: network.subnets
593
+ });
574
594
  });
575
595
 
576
596
  setSingleItemAsDefault(response.data.items, 'fixed_network', 'id');
577
597
  }
578
598
 
599
+ function changeFixedNetwork(model) {
600
+ if (model.fixed_network) {
601
+ subnetTitleMap = [{value:"", name: gettext("Choose an existing Subnet")}];
602
+ angular.forEach(networkTitleMap, function(network) {
603
+ if (network.value === model.fixed_network) {
604
+ angular.forEach(network.subnets, function(subnet) {
605
+ subnetTitleMap.push({value: subnet.id, name: subnet.name});
606
+ });
607
+ }
608
+ });
609
+ } else {
610
+ fixedSubnets = [{value:"", name: fixedSubnetsInitial}];
611
+ model.fixed_subnet = "";
612
+ }
613
+ form[0].tabs[2].items[0].items[0].items[3].titleMap = subnetTitleMap;
614
+ }
615
+
579
616
  function onGetIngressControllers(response) {
580
617
  angular.forEach(response.data.controllers, function(ingressController) {
581
618
  ingressTitleMap.push({value: ingressController, name: ingressController.name});
@@ -9,9 +9,11 @@ Bharat Kunwar <brtknr@bath.edu>
9
9
  Bradley Jones <jones.bradley@me.com>
10
10
  Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
11
11
  Charles Short <zulcss@gmail.com>
12
+ Corey Bryant <corey.bryant@canonical.com>
12
13
  Doug Hellmann <doug@doughellmann.com>
13
14
  Erik Olof Gunnar Andersson <eandersson@blizzard.com>
14
15
  Feilong Wang <flwang@catalyst.net.nz>
16
+ Felipe Reyes <felipe.reyes@canonical.com>
15
17
  Flavio Percoco <flaper87@gmail.com>
16
18
  Ghanshyam Mann <gmann@ghanshyammann.com>
17
19
  Hervé Beraud <hberaud@redhat.com>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: magnum-ui
3
- Version: 13.0.0
3
+ Version: 14.0.0
4
4
  Summary: Magnum User Interface
5
5
  Home-page: https://docs.openstack.org/developer/magnum-ui/
6
6
  Author: OpenStack
@@ -18,6 +18,8 @@ Classifier: Programming Language :: Python :: 3.6
18
18
  Classifier: Programming Language :: Python :: 3.7
19
19
  Classifier: Programming Language :: Python :: 3.8
20
20
  Classifier: Programming Language :: Python :: 3.9
21
+ Classifier: Programming Language :: Python :: 3.10
22
+ Classifier: Programming Language :: Python :: 3.11
21
23
  Requires-Dist: horizon (>=17.1.0)
22
24
  Requires-Dist: pbr (!=2.1.0,>=2.0.0)
23
25
  Requires-Dist: python-heatclient (>=1.18.0)
@@ -8,21 +8,21 @@ magnum_ui/api/rest/__init__.py,sha256=YNQkFUbPTeSOVF8Fs1OeCkAfsoIBBNZfePBNe93EJg
8
8
  magnum_ui/api/rest/magnum.py,sha256=NGX1yw3G8w6vQxSAf2SP6RugpNxlAr6MSMS9OusPhV4,15704
9
9
  magnum_ui/content/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
10
10
  magnum_ui/content/cluster_templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
11
- magnum_ui/content/cluster_templates/panel.py,sha256=ceFrWC_jf-rRsEp_tA0_RGvSqsZkVcqu5SUE6iCPk0I,790
11
+ magnum_ui/content/cluster_templates/panel.py,sha256=yU0HwXKvIQ4oThM9yB2kldJ4mdV2NlENHWjs4WHVn20,789
12
12
  magnum_ui/content/cluster_templates/tests.py,sha256=yfPCTURC9vPMZKbWQkbyC7SCuhdHxn6Bm3rp5nb-vlY,803
13
- magnum_ui/content/cluster_templates/urls.py,sha256=qHJdqn6-LK0KtkKPNAEUiwhVg-2ZSuxcxaCyvI90vhM,1063
13
+ magnum_ui/content/cluster_templates/urls.py,sha256=ZXOJLEPaqhagE9m5f6c-5ONaHTXmrH9xtyqadAV3xhU,1062
14
14
  magnum_ui/content/clusters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
- magnum_ui/content/clusters/panel.py,sha256=IaB4vGew1NkNjyLIIYrNRWc7eDmEa4lE-9OoT6Uz740,915
15
+ magnum_ui/content/clusters/panel.py,sha256=x6Wy2P7kZ0ERbt9TDpttBhymoEW22LzBAvVYlXrV0-Y,914
16
16
  magnum_ui/content/clusters/tests.py,sha256=owdzmnq03YT8v35hiI5EyjjjQebNy5uMRlJhJ0dW_mY,786
17
- magnum_ui/content/clusters/urls.py,sha256=zAi7rMQcd31K7G8nabzJlnus5b-QWwjMMPIWhQzRM8k,995
17
+ magnum_ui/content/clusters/urls.py,sha256=e64F-BWVqZP-HWGXeM7VFPZzo3tI29G4iAo0u2RbSqs,994
18
18
  magnum_ui/content/container_infra/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
19
19
  magnum_ui/content/container_infra/quotas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
20
- magnum_ui/content/container_infra/quotas/panel.py,sha256=4kCd7PfgeqCx_ktTh1Z2x-3MBo1tm3pg29ptqy3HySc,735
21
- magnum_ui/content/container_infra/quotas/urls.py,sha256=JdZVxeREJrkdzaNmCK-5LKll0tDs4YEG9JKkxCf2VHA,972
22
- magnum_ui/enabled/_1370_project_container_infra_panel_group.py,sha256=nEiwApHPnHZ6O9M7EYoa7sYbEr_zDFH8KPHRT07o2Y4,1237
20
+ magnum_ui/content/container_infra/quotas/panel.py,sha256=M0ftnrfrC_9BOwdpSRgvwUeLYCQ0gEY_N2Wsj2ghLuc,734
21
+ magnum_ui/content/container_infra/quotas/urls.py,sha256=r38-5c0BPbQ-PbbDYkt9mQdGp_ZCAh6MSzAl4x-5BKw,971
22
+ magnum_ui/enabled/_1370_project_container_infra_panel_group.py,sha256=26LX_RR-d546hoLKtKomiQFbJLlj-3ZW7wCdyc_vCw4,1236
23
23
  magnum_ui/enabled/_1371_project_container_infra_clusters_panel.py,sha256=Y7kTPbqno78ftpbztAH8iQg6MQsxReMNCPol9Zr7Clk,988
24
24
  magnum_ui/enabled/_1372_project_container_infra_cluster_templates_panel.py,sha256=IYWuV327uzqk2nrv7Xv0HMzqa0lUtN8B6ni-VKSDJrg,1014
25
- magnum_ui/enabled/_2370_admin_container_infra_panel_group.py,sha256=CpI_YNW3a-tVaUYIk-nIA38Y6f7FcABgU6V9DKWfebs,924
25
+ magnum_ui/enabled/_2370_admin_container_infra_panel_group.py,sha256=sS_fSp3C-4Q_7EOCR5HalHH5hn5gCXbnordfAUEia8I,923
26
26
  magnum_ui/enabled/_2371_admin_container_infra_quotas_panel.py,sha256=yrbVDggINc_c2BHDwF4SxC2wDA0vVuo10mDK20lZ8Og,970
27
27
  magnum_ui/enabled/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
28
28
  magnum_ui/locale/cs/LC_MESSAGES/django.po,sha256=iqvZiO_EGnAPfrxrelxBtR9sHF47nbXQog-qpuaeYIQ,753
@@ -58,7 +58,7 @@ magnum_ui/static/dashboard/container-infra/cluster-templates/actions.module.spec
58
58
  magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js,sha256=7OZvrFqhO05GV-MynHVYPOBJuCFNyI6DH1U4zpVzexo,4985
59
59
  magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.spec.js,sha256=BYsONDlXKtx-CATScKWVC-h2mG7larUwi10eGVGr-6U,869
60
60
  magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.service.js,sha256=A8KvmpEpfBnyjrOZX2UL3ERIpKPF3LNnueHMjiLTaHM,2154
61
- magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.service.spec.js,sha256=lqGlxnHYFxr3Mbxd8OILVrty31Kq2dAvGgJ43jl8GRM,1917
61
+ magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.service.spec.js,sha256=Z3oml3uxAScG36mCB8MZtUcpCeR72BDkFth_hS7hO4w,2281
62
62
  magnum_ui/static/dashboard/container-infra/cluster-templates/panel.html,sha256=PpOMs9-spyY87j-JZdJxHRmKJkO4okwvu4Wv4kvEkbQ,221
63
63
  magnum_ui/static/dashboard/container-infra/cluster-templates/create/create.service.js,sha256=1u-oU6VxmCapNrEj8u-eWYGVEidiDQppFZsEioaS5zM,2945
64
64
  magnum_ui/static/dashboard/container-infra/cluster-templates/create/create.service.spec.js,sha256=UM4dx5THxDTng3qdXZZiJSv0HVwl3kIUT7nlcmq_NpM,2509
@@ -91,7 +91,7 @@ magnum_ui/static/dashboard/container-infra/clusters/clusters.service.spec.js,sha
91
91
  magnum_ui/static/dashboard/container-infra/clusters/panel.html,sha256=SoSjm69fTYK0OKxAP9Sd8kGY9Qn0vGwQ_Ljc55ADvUo,1005
92
92
  magnum_ui/static/dashboard/container-infra/clusters/config/config.service.js,sha256=C299DjSDJPfZ6xEc2-Qcj3C9TpUrpPwToQHU021QkBo,2351
93
93
  magnum_ui/static/dashboard/container-infra/clusters/config/config.service.spec.js,sha256=Ej_ztZATzc8Ui__DHMzZrd0XwpPlAfjR2SzjMugM_B4,2827
94
- magnum_ui/static/dashboard/container-infra/clusters/create/create.service.js,sha256=Y2_HnTtkD_RqoxlAMbvSl_dcBa6hd5-mB4GlrQL3pNI,6521
94
+ magnum_ui/static/dashboard/container-infra/clusters/create/create.service.js,sha256=fEjaHZNOUwtXMGote1qkA3WIzbsBCD1Ra-IiXHOB9FM,6590
95
95
  magnum_ui/static/dashboard/container-infra/clusters/create/create.service.spec.js,sha256=Ai0GTzTDPSraJQ5J8kOkKrrHd2F4z3MrU9rgrfPBl2c,4282
96
96
  magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.js,sha256=IXrRNs1ET4nP7hqbpcnz4KBm9y3V4TELjxRCdmI68us,5738
97
97
  magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.spec.js,sha256=jS5eILGS8toKIu1tcbKo-sS7cyS4P1PdbHTS8GaTb9g,4213
@@ -124,7 +124,7 @@ magnum_ui/static/dashboard/container-infra/clusters/workflow/details.help.html,s
124
124
  magnum_ui/static/dashboard/container-infra/clusters/workflow/management.help.html,sha256=cowhxDWnXXefPGRAbUTbXHZboXEmuLgk0CfMikDjIvQ,266
125
125
  magnum_ui/static/dashboard/container-infra/clusters/workflow/network.help.html,sha256=8VpsnBRp7wHupxgW_uizMpO0sCyW6R0CRMbzLhKRCt4,514
126
126
  magnum_ui/static/dashboard/container-infra/clusters/workflow/size.help.html,sha256=yzzhWnTOIcKzGmZz1JLA7L7ISrahbxZgB4yD0JVdQJ4,665
127
- magnum_ui/static/dashboard/container-infra/clusters/workflow/workflow.service.js,sha256=jNmBaly6eJnRxmDbOSS-oajEp-MbhhiMJVNG045HL6Q,23750
127
+ magnum_ui/static/dashboard/container-infra/clusters/workflow/workflow.service.js,sha256=O7n0OwAPJ_wZ0Fztnq_8_YnEO4LYIicU6uqa51IrKzo,25311
128
128
  magnum_ui/static/dashboard/container-infra/clusters/workflow/workflow.service.spec.js,sha256=iV9ZnzQZ8Qbtavh2dRudb3yxu6t9d2fD28U9Ajw-sxU,3861
129
129
  magnum_ui/static/dashboard/container-infra/quotas/actions.module.js,sha256=ijIKewMFFxNf8qBy1GtUcrAgr_5bkSp99GcYP_Axa8M,2434
130
130
  magnum_ui/static/dashboard/container-infra/quotas/actions.module.spec.js,sha256=rPt13c__si7ZrX_4SbxIXidlBfNtzznyjU0c6UyM9qU,1331
@@ -148,10 +148,10 @@ magnum_ui/test/test_data.py,sha256=FjDNKKnxx3nDTczb7kMQYbMlg5yhin06F080Gt9AkD0,3
148
148
  magnum_ui/test/api_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
149
149
  magnum_ui/test/api_tests/test_rest_api.py,sha256=A8VanDLVVnTdJeXstZs0CaokoE27uGbpt2k_x30TFqI,5516
150
150
  magnum_ui/test/integration_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
151
- magnum_ui-13.0.0.dist-info/AUTHORS,sha256=ln_4lNLFOeMX8yUc6-3an4eTlYMA1RBheQ9riAb3Lfc,2680
152
- magnum_ui-13.0.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
153
- magnum_ui-13.0.0.dist-info/METADATA,sha256=6zpOpd_Y6IHf9rEMzuJjij4YKi_cY5lsS75a9uKrheY,3393
154
- magnum_ui-13.0.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
155
- magnum_ui-13.0.0.dist-info/pbr.json,sha256=Dj2XbEp0aJCyekzDJWkyBPVJnEScKSU0wGjVpynj40Q,46
156
- magnum_ui-13.0.0.dist-info/top_level.txt,sha256=CDLukePJoQ3_SL4beNNspl5mYErPcdlNGI9CEKD01cA,10
157
- magnum_ui-13.0.0.dist-info/RECORD,,
151
+ magnum_ui-14.0.0.dist-info/AUTHORS,sha256=eje2mHa9Z-o-Z0V_MlqeI4DfgoLx9L4DmmUmvFCi5fg,2764
152
+ magnum_ui-14.0.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
153
+ magnum_ui-14.0.0.dist-info/METADATA,sha256=vQhPiuloH4vqfeD_9qU1tYWX6ORO6MYjOFVbSemyNyc,3495
154
+ magnum_ui-14.0.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
155
+ magnum_ui-14.0.0.dist-info/pbr.json,sha256=CunN4uWFtzZlTcTraOrj4k-bWIOtmbVq_lfzvbGQuzw,46
156
+ magnum_ui-14.0.0.dist-info/top_level.txt,sha256=CDLukePJoQ3_SL4beNNspl5mYErPcdlNGI9CEKD01cA,10
157
+ magnum_ui-14.0.0.dist-info/RECORD,,
@@ -0,0 +1 @@
1
+ {"git_version": "463d21c", "is_release": true}
@@ -1 +0,0 @@
1
- {"git_version": "a7278fc", "is_release": true}