From 1661af480f69216283b5de200280e152cb0590b5 Mon Sep 17 00:00:00 2001
From: Sander Steffann <sander@steffann.nl>
Date: Mon, 17 Jun 2019 21:09:08 +0200
Subject: [PATCH] Second attempt at a patch for #3193

---
 .../dcim/migrations/0070_multilink_circuit.py | 19 +++++++++++++++++++
 netbox/dcim/models.py                         |  6 +++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 netbox/dcim/migrations/0070_multilink_circuit.py

diff --git a/netbox/dcim/migrations/0070_multilink_circuit.py b/netbox/dcim/migrations/0070_multilink_circuit.py
new file mode 100644
index 000000000..6016da2f8
--- /dev/null
+++ b/netbox/dcim/migrations/0070_multilink_circuit.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.2.2 on 2019-06-17 19:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0069_deprecate_nullablecharfield'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='interface',
+            name='_connected_circuittermination',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='circuits.CircuitTermination'),
+        ),
+    ]
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index f8e8a028e..e3529a47b 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -1946,7 +1946,7 @@ class Interface(CableTermination, ComponentModel):
         blank=True,
         null=True
     )
-    _connected_circuittermination = models.OneToOneField(
+    _connected_circuittermination = models.ForeignKey(
         to='circuits.CircuitTermination',
         on_delete=models.SET_NULL,
         related_name='+',
@@ -2673,8 +2673,8 @@ class Cable(ChangeLoggedModel):
         Traverse both ends of a cable path and return its connected endpoints. Note that one or both endpoints may be
         None.
         """
-        a_path = self.termination_b.trace()
-        b_path = self.termination_a.trace()
+        a_path = self.termination_b.trace(follow_circuits=True)
+        b_path = self.termination_a.trace(follow_circuits=True)
 
         # Determine overall path status (connected or planned)
         if self.status == CONNECTION_STATUS_PLANNED: