Merge pull request #4 from jyssy/ctt-231

Updating ip_addresses and /services/api/hosts issue Ctt 231

Author: jpnavarro

.gitignore

@@ -136,3 +136,5 @@ operations-app.access-ci.org.pub
 **/.DS_Store
 {{ app_home }}/
 .idea/
+Pipfile
+Pipfile.lock

CHANGELOG

@@ -1,11 +1,13 @@
+v2.2.1 2024-10-09 jlambertson
+  - updated the Host model to conform to the multiple 'ip_addresses' addition from v2.2.0
+
 v2.2.0 2024-08-29 jlambertson
   - Added 'service_tags' and 'host_tags' to models, forms, and a few templates to enter and view user-added tags to both categories
   - Removed Notes from the export API, otherwise viewable while logged in
   - Increased character limit for host.ip_addresses and edited single grammar to include plural options
   - increased username character limit from 16 to 25
   - added a table, misc_urls, to models to include urls for various possible links being added to the site; as well as a name column by which the specific context urls can be queried
 
-
 v2.1.1 2023-03-22 JP
   - Remove API login requirement, contact names but no phone or emails are returned
 

Operations_ServiceIndex_Django/services/serializers.py

@@ -17,7 +17,7 @@ class Host_Serializer(serializers.ModelSerializer):
     host_tags = serializers.SerializerMethodField(read_only=True)
     class Meta:
         model = Host
-        fields = ('service', 'location', 'hostname', 'ip_address',
+        fields = ('service', 'location', 'hostname', 'ip_addresses',
             'qualys', 'nagios', 'syslog_standard_10514', 'syslog_relp_10515',
             'label', 'availability', 'support',
             'sys_admin', 'poc_primary', 'poc_backup', 'host_last_verified', 'host_tags')

Operations_ServiceIndex_Django/templates/services/services_for_pdf.html

@@ -60,7 +60,7 @@
     {% for i in s.instances %}
     <tr>
     <td style="text-align:right;" class="short"><b>{{ i.type }}:</b></td>
-    <td class="medium outlined">{{ i.location }}<br />{{ i.hostname }}<br />{{ i.ip_address }}</td>
+    <td class="medium outlined">{{ i.location }}<br />{{ i.hostname }}<br />{{ i.ip_addresses }}</td>
     <td class="short outlined">{{ i.availability }}<br />{{ i.support }}</td>
     {# <td><a href="mailto:{{ i.sys_admin.email }}">{{ i.sys_admin.name }}</a></td> #}
     <td class="medium outlined"><span>Sys Admin:</span><br />{{ i.sys_admin.last_name }}, {{ i.sys_admin.name }}<br />{{ i.sys_admin.email }}</td>

Pipfile

@@ -0,0 +1,28 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[dev-packages]
+
+[packages]
+django = "==4.1.*"
+#django = "==5.*"
+#django-cors-headers = "*"
+django-allauth = "==0.51.*"
+#django-allauth = "*"
+#django-bootstrap-v5 = "==1.0.*"
+django-bootstrap-v5 = "*"
+#django-bootstrap5 = "==24.*"
+psycopg2-binary = "*"
+#psycopg2 = "*"
+requests = "*"
+djangorestframework = "*"
+gunicorn = "==20.1.*"
+#django-extensions = "*"
+#werkzeug = "*"
+#pyopenssl = "*"
+
+[requires]
+python_version = "3.10"
+#python_version = "3.12"