From 48585469f6e6aee14c0474b28b94cfa402ccbee8 Mon Sep 17 00:00:00 2001
From: Neil Dorin <ndorin@pepperdash.com>
Date: Thu, 12 Nov 2020 16:28:43 -0700
Subject: [PATCH] Additional updates to resolve external switching with
 multiple upstream tie lines

---
 .../Codec/IHasExternalSourceSwitching.cs                 | 1 +
 .../VideoCodec/CiscoCodec/CiscoSparkCodec.cs             | 9 ++++++++-
 .../CiscoCodec/CiscoSparkCodecPropertiesConfig.cs        | 9 +++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasExternalSourceSwitching.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasExternalSourceSwitching.cs
index b4449d86..f8ef33ee 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasExternalSourceSwitching.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/IHasExternalSourceSwitching.cs	
@@ -11,6 +11,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 	public interface IHasExternalSourceSwitching
 	{
 		bool ExternalSourceListEnabled { get; }
+        string ExternalSourceInputPort { get; }
 		void AddExternalSource(string connectorId, string key, string name, eExternalSourceType type);
 		void SetExternalSourceState(string key, eExternalSourceMode mode);
 		void ClearExternalSources();
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index e2a094dc..ea39bb65 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -407,6 +407,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			CreateOsdSource();
 
             ExternalSourceListEnabled = props.ExternalSourceListEnabled;
+            ExternalSourceInputPort = props.ExternalSourceInputPort;
 
             if (props.UiBranding == null)
             {
@@ -416,6 +417,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 props.UiBranding.BrandingUrl);
 
             BrandingEnabled = props.UiBranding.Enable;
+
             _brandingUrl = props.UiBranding.BrandingUrl;
         }
 
@@ -1917,7 +1919,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		#region IHasExternalSourceSwitching Members
 
 		/// <summary>
-		/// Weather the Cisco supports External Source Lists or not 
+		/// Wheather the Cisco supports External Source Lists or not 
 		/// </summary>
 		public bool ExternalSourceListEnabled
 		{
@@ -1925,6 +1927,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 			private set; 
 		}
 
+        /// <summary>
+        /// The name of the RoutingInputPort to which the upstream external switcher is connected
+        /// </summary>
+        public string ExternalSourceInputPort { get;  private set; }
+
         public bool BrandingEnabled { get; private set; }
         private string _brandingUrl;
         private bool _sendMcUrl;
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs
index cd280b29..1836bafb 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
@@ -31,9 +31,18 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         [JsonProperty("sharing")]
         public SharingProperties Sharing { get; set; }
 
+        /// <summary>
+        /// Enables external source switching capability
+        /// </summary>
 		[JsonProperty("externalSourceListEnabled")]
 		public bool ExternalSourceListEnabled { get; set; }
 
+        /// <summary>
+        /// The name of the routing input port on the codec to which the external switch is connected
+        /// </summary>
+        [JsonProperty("externalSourceInputPort")]
+        public string ExternalSourceInputPort { get; set; }
+
         /// <summary>
         /// Optionsal property to set the limit of any phonebook queries for directory or searching
         /// </summary>