From aeab73540c306e5f906bccc444c252d8ad2adc34 Mon Sep 17 00:00:00 2001 From: Carlos Konstanski Date: Mon, 4 May 2020 11:20:15 -0600 Subject: quick fixes --- src/caas/migrations/0001_initial.py | 74 ++++++++++++++ src/caas/migrations/0002_vlan_yourmom.py | 18 ++++ src/caas/migrations/0003_remove_vlan_yourmom.py | 17 ++++ src/caas/models.py | 17 +++- src/far_edge_ops_api/setting.py.example | 124 ------------------------ src/far_edge_ops_api/settings.py.example | 124 ++++++++++++++++++++++++ 6 files changed, 245 insertions(+), 129 deletions(-) create mode 100644 src/caas/migrations/0001_initial.py create mode 100644 src/caas/migrations/0002_vlan_yourmom.py create mode 100644 src/caas/migrations/0003_remove_vlan_yourmom.py delete mode 100644 src/far_edge_ops_api/setting.py.example create mode 100644 src/far_edge_ops_api/settings.py.example (limited to 'src') diff --git a/src/caas/migrations/0001_initial.py b/src/caas/migrations/0001_initial.py new file mode 100644 index 0000000..409c48f --- /dev/null +++ b/src/caas/migrations/0001_initial.py @@ -0,0 +1,74 @@ +# Generated by Django 3.0.5 on 2020-05-04 16:28 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='VcpfeLocation', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('fuze_spm_site_id', models.CharField(max_length=16)), + ('fuze_spm_site_name', models.CharField(max_length=255)), + ('fuze_spm_market', models.CharField(max_length=255)), + ('fuze_spm_submarket', models.CharField(max_length=255)), + ('fuze_spm_site_type', models.CharField(choices=[('DRAN', 'DRAN'), ('CRAN', 'CRAN')], max_length=4)), + ('central_controller_sap_clli', models.CharField(max_length=255)), + ('vcu_sap_clli', models.CharField(max_length=255)), + ('csr_hostname', models.CharField(max_length=255)), + ('f1c_f1u_subnet', models.CharField(max_length=255)), + ('f1c_f1u_default_gateway', models.CharField(max_length=255)), + ('oam_subnet', models.CharField(max_length=255)), + ('oam_default_gateway', models.CharField(max_length=255)), + ('mgmt_subnet', models.CharField(max_length=255)), + ('mgmt_default_gateway', models.CharField(max_length=255)), + ('ilo_subnet', models.CharField(max_length=255)), + ('ilo_default_gateway', models.CharField(max_length=255)), + ('fhgw_subnet', models.CharField(max_length=255)), + ('fhgw_default_gateway', models.CharField(max_length=255)), + ], + ), + migrations.CreateModel( + name='Vlan', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('host_vlan', models.PositiveSmallIntegerField()), + ('oam_vlan', models.PositiveSmallIntegerField()), + ('mgmt_vlan', models.PositiveSmallIntegerField()), + ], + ), + migrations.CreateModel( + name='VcpfeServer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('server_number', models.PositiveSmallIntegerField()), + ('server_hostname', models.CharField(max_length=255)), + ('cluster_name', models.CharField(max_length=255)), + ('f1u_address', models.CharField(max_length=255)), + ('f1c_address', models.CharField(max_length=255)), + ('oam_host_address', models.CharField(max_length=255)), + ('oam_vip_address', models.CharField(max_length=255)), + ('mgmt_address_range_start', models.CharField(max_length=255)), + ('mgmt_address_range_end', models.CharField(max_length=255)), + ('ilo_host_address', models.CharField(max_length=255)), + ('fhgw_host_address', models.CharField(max_length=255)), + ('vlan_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='caas.Vlan')), + ], + ), + migrations.CreateModel( + name='Namespace', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('namespace_name', models.CharField(max_length=255)), + ('server_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='caas.VcpfeServer')), + ], + ), + ] diff --git a/src/caas/migrations/0002_vlan_yourmom.py b/src/caas/migrations/0002_vlan_yourmom.py new file mode 100644 index 0000000..9b41b10 --- /dev/null +++ b/src/caas/migrations/0002_vlan_yourmom.py @@ -0,0 +1,18 @@ +# Generated by Django 3.0.6 on 2020-05-04 17:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('caas', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='vlan', + name='yourmom', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + ] diff --git a/src/caas/migrations/0003_remove_vlan_yourmom.py b/src/caas/migrations/0003_remove_vlan_yourmom.py new file mode 100644 index 0000000..cadda81 --- /dev/null +++ b/src/caas/migrations/0003_remove_vlan_yourmom.py @@ -0,0 +1,17 @@ +# Generated by Django 3.0.6 on 2020-05-04 17:02 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('caas', '0002_vlan_yourmom'), + ] + + operations = [ + migrations.RemoveField( + model_name='vlan', + name='yourmom', + ), + ] diff --git a/src/caas/models.py b/src/caas/models.py index 562951b..6ad754f 100644 --- a/src/caas/models.py +++ b/src/caas/models.py @@ -9,12 +9,20 @@ class Vlan(models.Model): return "host_vlan: %s , oam_vlan: %s , mgmt_vlan: %s" % (self.host_vlan, self.oam_vlan, self.mgmt_vlan) -class VcpfeLocation(models.Mode): +class Namespace(models.Model): + namespace_name = models.CharField(max_length=255) + server_id = models.ForeignKey('VcpfeServer', on_delete=models.SET_NULL, blank=True, null=True) + + def __str__(self): + return "namespace_name: %s , server_id : %s" % (self.namespace_name, self.server_id) + + +class VcpfeLocation(models.Model): fuze_spm_site_id = models.CharField(max_length=16) fuze_spm_site_name = models.CharField(max_length=255) fuze_spm_market = models.CharField(max_length=255) fuze_spm_submarket = models.CharField(max_length=255) - fuze_spm_site_type = models.CharField(max_length=4, choices=[('DRAN', 'DRAN'), ('CRAN', 'CRAN')])) + fuze_spm_site_type = models.CharField(max_length=4, choices=[('DRAN', 'DRAN'), ('CRAN', 'CRAN')]) central_controller_sap_clli = models.CharField(max_length=255) vcu_sap_clli = models.CharField(max_length=255) csr_hostname = models.CharField(max_length=255) @@ -30,14 +38,13 @@ class VcpfeLocation(models.Mode): fhgw_default_gateway = models.CharField(max_length=255) def __str__(self): - return "%s : %s : %s : %s : %s" % (self.fuze_spm_site_id, self.fuze_spm_site_name, self.fuze_spm_market self.fuze_spm_submarket, self.fuze_spm_site_type) + return "%s : %s : %s : %s : %s" % (self.fuze_spm_site_id, self.fuze_spm_site_name, self.fuze_spm_market, self.fuze_spm_submarket, self.fuze_spm_site_type) class VcpfeServer(models.Model): server_number = models.PositiveSmallIntegerField() server_hostname = models.CharField(max_length=255) cluster_name = models.CharField(max_length=255) - namespace_name = models.CharField(max_length=255) f1u_address = models.CharField(max_length=255) f1c_address = models.CharField(max_length=255) oam_host_address = models.CharField(max_length=255) @@ -46,7 +53,7 @@ class VcpfeServer(models.Model): mgmt_address_range_end = models.CharField(max_length=255) ilo_host_address = models.CharField(max_length=255) fhgw_host_address = models.CharField(max_length=255) - vlan_id = models.ForeignKey(Vlan, on_delete=models.SET_NULL, blank=True, null=True) + vlan_id = models.ForeignKey('Vlan', on_delete=models.SET_NULL, blank=True, null=True) def __str__(self): return "%s : %s : %s" % (self.server_hostname, self.cluster_name, self.namespace_name) diff --git a/src/far_edge_ops_api/setting.py.example b/src/far_edge_ops_api/setting.py.example deleted file mode 100644 index f89eeea..0000000 --- a/src/far_edge_ops_api/setting.py.example +++ /dev/null @@ -1,124 +0,0 @@ -""" -Django settings for far_edge_ops_api project. - -Generated by 'django-admin startproject' using Django 3.0.5. - -For more information on this file, see -https://docs.djangoproject.com/en/3.0/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.0/ref/settings/ -""" - -import os - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '_%q*cv!0fu&z%#17ved2zq-6y^*#^1pt#gma))h6g(=jw!q14o' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False - -ALLOWED_HOSTS = ['*'] - - -# Application definition - -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -ROOT_URLCONF = 'far_edge_ops_api.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - ], - }, - }, -] - -WSGI_APPLICATION = 'far_edge_ops_api.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/3.0/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'NAME': 'faredge', - 'HOST': 'localhost', - 'PORT': '3306', - 'USER': 'faredge', - 'PASSWORD': 'neweboy' - } -} - - -# Password validation -# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - -# Internationalization -# https://docs.djangoproject.com/en/3.0/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.0/howto/static-files/ - -STATIC_URL = '/static/' diff --git a/src/far_edge_ops_api/settings.py.example b/src/far_edge_ops_api/settings.py.example new file mode 100644 index 0000000..e64066c --- /dev/null +++ b/src/far_edge_ops_api/settings.py.example @@ -0,0 +1,124 @@ +""" +Django settings for far_edge_ops_api project. + +Generated by 'django-admin startproject' using Django 3.0.5. + +For more information on this file, see +https://docs.djangoproject.com/en/3.0/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/3.0/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = '_%q*cv!0fu&z%#17ved2zq-6y^*#^1pt#gma))h6g(=jw!q14o' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = False + +ALLOWED_HOSTS = ['*'] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'far_edge_ops_api.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'far_edge_ops_api.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/3.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'faredge', + 'HOST': 'localhost', + 'PORT': '3306', + 'USER': 'faredge', + 'PASSWORD': 'password' + } +} + + +# Password validation +# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/3.0/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/3.0/howto/static-files/ + +STATIC_URL = '/static/' -- cgit v1.3