Skip to content

Commit 9db770f

Browse files
abdulgaffarabdulgaffar
committed
Modified option to select networks and updating subnets allocation range of selected networks
1 parent e9f53ce commit 9db770f

31 files changed

Lines changed: 556 additions & 763 deletions

‎.idea/workspace.xml‎

Lines changed: 246 additions & 165 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ntt_tool/apps/cloud/migrations/0001_initial.py‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
# Generated by Django 1.9.2 on 2016-03-18 10:33
2+
# Generated by Django 1.9.2 on 2016-04-04 07:17
33
from __future__ import unicode_literals
44

55
from django.conf import settings
@@ -39,10 +39,9 @@ class Migration(migrations.Migration):
3939
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
4040
('network_id', models.CharField(max_length=255)),
4141
('network_name', models.CharField(max_length=255)),
42-
('network_cidr', models.CharField(max_length=255)),
4342
('shared', models.BooleanField(default=False)),
44-
('subnet', models.CharField(blank=True, max_length=255, null=True)),
4543
('status', models.CharField(max_length=25)),
44+
('is_dirty', models.BooleanField(default=False)),
4645
('created_on', models.DateTimeField(auto_now=True)),
4746
('updated_on', models.DateTimeField(auto_now_add=True)),
4847
('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
@@ -58,6 +57,7 @@ class Migration(migrations.Migration):
5857
('router_id', models.CharField(max_length=255)),
5958
('router_name', models.CharField(max_length=255)),
6059
('status', models.CharField(max_length=25)),
60+
('is_dirty', models.BooleanField(default=False)),
6161
('created_on', models.DateTimeField(auto_now=True)),
6262
('updated_on', models.DateTimeField(auto_now_add=True)),
6363
('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
@@ -66,6 +66,25 @@ class Migration(migrations.Migration):
6666
'db_table': 'cloud_tenant_routers',
6767
},
6868
),
69+
migrations.CreateModel(
70+
name='Subnet',
71+
fields=[
72+
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
73+
('subnet_id', models.CharField(max_length=255)),
74+
('subnet_name', models.CharField(max_length=255)),
75+
('cidr', models.CharField(max_length=255)),
76+
('allocation_range_start', models.GenericIPAddressField(blank=True, null=True)),
77+
('allocation_range_end', models.GenericIPAddressField(blank=True, null=True)),
78+
('selected_allocation_range_start', models.GenericIPAddressField(blank=True, null=True)),
79+
('selected_allocation_range_end', models.GenericIPAddressField(blank=True, null=True)),
80+
('is_selected', models.BooleanField(default=False)),
81+
('is_dirty', models.BooleanField(default=False)),
82+
('network', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subnets', to='cloud.Network')),
83+
],
84+
options={
85+
'db_table': 'cloud_tenant_network_subnets',
86+
},
87+
),
6988
migrations.CreateModel(
7089
name='Tenant',
7190
fields=[
@@ -74,6 +93,7 @@ class Migration(migrations.Migration):
7493
('tenant_name', models.CharField(max_length=256)),
7594
('description', models.CharField(blank=True, max_length=256, null=True)),
7695
('enabled', models.BooleanField(default=False)),
96+
('is_dirty', models.BooleanField(default=False)),
7797
('created_on', models.DateTimeField(auto_now=True)),
7898
('updated_on', models.DateTimeField(auto_now_add=True)),
7999
('cloud', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='tenants', to='cloud.Cloud')),
@@ -95,14 +115,16 @@ class Migration(migrations.Migration):
95115
('remote_pass', models.CharField(max_length=100)),
96116
('test_method', models.CharField(max_length=100)),
97117
('iperf_duration', models.IntegerField()),
98-
('tenant_type', models.CharField(choices=[('all', 'All'), ('intra-tenant', 'Intra Tenant'), ('inter-tenant', 'Inter Tenant'), ('south-north', 'South to North'), ('north-south', 'North to South')], default='all', max_length=20)),
118+
('test_type', models.CharField(choices=[('all', 'All'), ('intra-tenant', 'Intra Tenant'), ('inter-tenant', 'Inter Tenant'), ('south-north', 'South to North'), ('north-south', 'North to South')], default='all', max_length=20)),
99119
('external_host', models.CharField(blank=True, max_length=100, null=True)),
100120
('ssh_gateway', models.CharField(blank=True, max_length=100, null=True)),
121+
('test_environment', models.CharField(choices=[('dev', 'Development/Test'), ('prod', 'Production')], default='dev', max_length=20)),
101122
('created_on', models.DateTimeField(auto_now=True)),
102123
('updated_on', models.DateTimeField(auto_now_add=True)),
103124
('cloud', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='cloud_traffic', to='cloud.Cloud')),
104125
('creator', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
105-
('tenants', models.ManyToManyField(to='cloud.Tenant')),
126+
('selected_networks', models.ManyToManyField(blank=True, to='cloud.Network')),
127+
('tenants', models.ManyToManyField(blank=True, to='cloud.Tenant')),
106128
],
107129
options={
108130
'db_table': 'cloud_traffic',

‎ntt_tool/apps/cloud/migrations/0002_auto_20160318_1057.py‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎ntt_tool/apps/cloud/migrations/0002_auto_20160404_0842.py‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# -*- coding: utf-8 -*-
2+
# Generated by Django 1.9.2 on 2016-04-04 08:42
3+
from __future__ import unicode_literals
4+
5+
from django.db import migrations
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('cloud', '0001_initial'),
12+
]
13+
14+
operations = [
15+
migrations.RenameField(
16+
model_name='subnet',
17+
old_name='allocation_range_end',
18+
new_name='allocation_pool_end',
19+
),
20+
migrations.RenameField(
21+
model_name='subnet',
22+
old_name='allocation_range_start',
23+
new_name='allocation_pool_end_selected',
24+
),
25+
migrations.RenameField(
26+
model_name='subnet',
27+
old_name='selected_allocation_range_end',
28+
new_name='allocation_pool_start',
29+
),
30+
migrations.RenameField(
31+
model_name='subnet',
32+
old_name='selected_allocation_range_start',
33+
new_name='allocation_pool_start_selected',
34+
),
35+
]

‎ntt_tool/apps/cloud/migrations/0003_auto_20160318_1153.py‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎ntt_tool/apps/cloud/migrations/0004_auto_20160321_0621.py‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎ntt_tool/apps/cloud/migrations/0005_auto_20160321_0630.py‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎ntt_tool/apps/cloud/migrations/0006_auto_20160321_0634.py‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎ntt_tool/apps/cloud/migrations/0007_auto_20160330_0745.py‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)