Draft: Discriminator.test *** DO NOT MERGE ***

sdk/Lusid.Sdk/Api/TransactionPortfoliosApi.cs

@@ -336,7 +336,7 @@ public interface ITransactionPortfoliosApiSync : IApiAccessor
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <returns>HoldingsAdjustment</returns>
         HoldingsAdjustment GetHoldingsAdjustment(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>));
 
@@ -351,7 +351,7 @@ public interface ITransactionPortfoliosApiSync : IApiAccessor
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <returns>ApiResponse of HoldingsAdjustment</returns>
         ApiResponse<HoldingsAdjustment> GetHoldingsAdjustmentWithHttpInfo(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>));
         /// <summary>
@@ -1000,7 +1000,7 @@ public interface ITransactionPortfoliosApiAsync : IApiAccessor
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of HoldingsAdjustment</returns>
         System.Threading.Tasks.Task<HoldingsAdjustment> GetHoldingsAdjustmentAsync(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
@@ -1016,7 +1016,7 @@ public interface ITransactionPortfoliosApiAsync : IApiAccessor
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (HoldingsAdjustment)</returns>
         System.Threading.Tasks.Task<ApiResponse<HoldingsAdjustment>> GetHoldingsAdjustmentWithHttpInfoAsync(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
@@ -3457,7 +3457,7 @@ public async System.Threading.Tasks.Task<Lusid.Sdk.Client.ApiResponse<VersionedR
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <returns>HoldingsAdjustment</returns>
         public HoldingsAdjustment GetHoldingsAdjustment(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>))
         {
@@ -3473,7 +3473,7 @@ public HoldingsAdjustment GetHoldingsAdjustment(string scope, string code, DateT
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <returns>ApiResponse of HoldingsAdjustment</returns>
         public Lusid.Sdk.Client.ApiResponse<HoldingsAdjustment> GetHoldingsAdjustmentWithHttpInfo(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>))
         {
@@ -3550,7 +3550,7 @@ public Lusid.Sdk.Client.ApiResponse<HoldingsAdjustment> GetHoldingsAdjustmentWit
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of HoldingsAdjustment</returns>
         public async System.Threading.Tasks.Task<HoldingsAdjustment> GetHoldingsAdjustmentAsync(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
@@ -3567,7 +3567,7 @@ public async System.Threading.Tasks.Task<HoldingsAdjustment> GetHoldingsAdjustme
         /// <param name="code">The code of the transaction portfolio. Together with the scope this uniquely identifies              the transaction portfolio.</param>
         /// <param name="effectiveAt">The effective datetime or cut label of the holdings adjustment.</param>
         /// <param name="asAt">The asAt datetime at which to retrieve the holdings adjustment. Defaults to the return the latest              version of the holdings adjustment if not specified. (optional)</param>
-        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
+        /// <param name="propertyKeys">A list of property keys from the ‘Instrument&#39; domain to decorate onto holdings adjustments.              These must have the format {domain}/{scope}/{code}, for example &#39;Instrument/system/Name&#39;.              Note that properties from the &#39;Holding’ domain are automatically returned. (optional)</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (HoldingsAdjustment)</returns>
         public async System.Threading.Tasks.Task<Lusid.Sdk.Client.ApiResponse<HoldingsAdjustment>> GetHoldingsAdjustmentWithHttpInfoAsync(string scope, string code, DateTimeOrCutLabel effectiveAt, DateTimeOffset? asAt = default(DateTimeOffset?), List<string> propertyKeys = default(List<string>), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))

sdk/Lusid.Sdk/Client/Configuration.cs

@@ -103,15 +103,15 @@ public Configuration()
         {
             Proxy = null;
             UserAgent = "OpenAPI-Generator/0.11.4750/csharp";
-            BasePath = "https://www.lusid.com/api";
+            BasePath = "https://fbn-ci.lusid.com/api";
             DefaultHeaders = new ConcurrentDictionary<string, string>();
             ApiKey = new ConcurrentDictionary<string, string>();
             ApiKeyPrefix = new ConcurrentDictionary<string, string>();
             Servers = new List<IReadOnlyDictionary<string, object>>()
             {
                 {
                     new Dictionary<string, object> {
-                        {"url", "https://www.lusid.com/api"},
+                        {"url", "https://fbn-ci.lusid.com/api"},
                         {"description", "No description provided"},
                     }
                 }
@@ -129,7 +129,7 @@ public Configuration()
             IDictionary<string, string> defaultHeaders,
             IDictionary<string, string> apiKey,
             IDictionary<string, string> apiKeyPrefix,
-            string basePath = "https://www.lusid.com/api") : this()
+            string basePath = "https://fbn-ci.lusid.com/api") : this()
         {
             if (string.IsNullOrWhiteSpace(basePath))
                 throw new ArgumentException("The provided basePath is invalid.", "basePath");

sdk/Lusid.Sdk/Model/ComplexMarketData.cs

@@ -32,6 +32,19 @@ namespace Lusid.Sdk.Model
     /// </summary>
     [DataContract(Name = "ComplexMarketData")]
     [JsonConverter(typeof(JsonSubtypes), "MarketDataType")]
+    [JsonSubtypes.KnownSubType(typeof(CreditSpreadCurveData), "CreditSpreadCurveData")]
+    [JsonSubtypes.KnownSubType(typeof(DiscountFactorCurveData), "DiscountFactorCurveData")]
+    [JsonSubtypes.KnownSubType(typeof(EquityCurveByPricesData), "EquityCurveByPricesData")]
+    [JsonSubtypes.KnownSubType(typeof(EquityVolSurfaceData), "EquityVolSurfaceData")]
+    [JsonSubtypes.KnownSubType(typeof(FxForwardCurveByQuoteReference), "FxForwardCurveByQuoteReference")]
+    [JsonSubtypes.KnownSubType(typeof(FxForwardCurveData), "FxForwardCurveData")]
+    [JsonSubtypes.KnownSubType(typeof(FxForwardPipsCurveData), "FxForwardPipsCurveData")]
+    [JsonSubtypes.KnownSubType(typeof(FxForwardTenorCurveData), "FxForwardTenorCurveData")]
+    [JsonSubtypes.KnownSubType(typeof(FxForwardTenorPipsCurveData), "FxForwardTenorPipsCurveData")]
+    [JsonSubtypes.KnownSubType(typeof(FxVolSurfaceData), "FxVolSurfaceData")]
+    [JsonSubtypes.KnownSubType(typeof(IrVolCubeData), "IrVolCubeData")]
+    [JsonSubtypes.KnownSubType(typeof(OpaqueMarketData), "OpaqueMarketData")]
+    [JsonSubtypes.KnownSubType(typeof(YieldCurveData), "YieldCurveData")]
     public partial class ComplexMarketData : IEquatable<ComplexMarketData>
     {
         /// <summary>

sdk/Lusid.Sdk/Model/LusidInstrument.cs

@@ -32,6 +32,35 @@ namespace Lusid.Sdk.Model
     /// </summary>
     [DataContract(Name = "LusidInstrument")]
     [JsonConverter(typeof(JsonSubtypes), "InstrumentType")]
+    [JsonSubtypes.KnownSubType(typeof(Basket), "Basket")]
+    [JsonSubtypes.KnownSubType(typeof(Bond), "Bond")]
+    [JsonSubtypes.KnownSubType(typeof(CapFloor), "CapFloor")]
+    [JsonSubtypes.KnownSubType(typeof(CashPerpetual), "CashPerpetual")]
+    [JsonSubtypes.KnownSubType(typeof(CdsIndex), "CdsIndex")]
+    [JsonSubtypes.KnownSubType(typeof(ComplexBond), "ComplexBond")]
+    [JsonSubtypes.KnownSubType(typeof(ContractForDifference), "ContractForDifference")]
+    [JsonSubtypes.KnownSubType(typeof(CreditDefaultSwap), "CreditDefaultSwap")]
+    [JsonSubtypes.KnownSubType(typeof(Equity), "Equity")]
+    [JsonSubtypes.KnownSubType(typeof(EquityOption), "EquityOption")]
+    [JsonSubtypes.KnownSubType(typeof(EquitySwap), "EquitySwap")]
+    [JsonSubtypes.KnownSubType(typeof(ExchangeTradedOption), "ExchangeTradedOption")]
+    [JsonSubtypes.KnownSubType(typeof(ExoticInstrument), "ExoticInstrument")]
+    [JsonSubtypes.KnownSubType(typeof(FixedLeg), "FixedLeg")]
+    [JsonSubtypes.KnownSubType(typeof(FloatingLeg), "FloatingLeg")]
+    [JsonSubtypes.KnownSubType(typeof(ForwardRateAgreement), "ForwardRateAgreement")]
+    [JsonSubtypes.KnownSubType(typeof(FundingLeg), "FundingLeg")]
+    [JsonSubtypes.KnownSubType(typeof(Future), "Future")]
+    [JsonSubtypes.KnownSubType(typeof(FxForward), "FxForward")]
+    [JsonSubtypes.KnownSubType(typeof(FxOption), "FxOption")]
+    [JsonSubtypes.KnownSubType(typeof(FxSwap), "FxSwap")]
+    [JsonSubtypes.KnownSubType(typeof(InflationLinkedBond), "InflationLinkedBond")]
+    [JsonSubtypes.KnownSubType(typeof(InstrumentLeg), "InstrumentLeg")]
+    [JsonSubtypes.KnownSubType(typeof(InterestRateSwap), "InterestRateSwap")]
+    [JsonSubtypes.KnownSubType(typeof(InterestRateSwaption), "InterestRateSwaption")]
+    [JsonSubtypes.KnownSubType(typeof(ReferenceInstrument), "ReferenceInstrument")]
+    [JsonSubtypes.KnownSubType(typeof(Repo), "Repo")]
+    [JsonSubtypes.KnownSubType(typeof(SimpleInstrument), "SimpleInstrument")]
+    [JsonSubtypes.KnownSubType(typeof(TermDeposit), "TermDeposit")]
     public partial class LusidInstrument : IEquatable<LusidInstrument>
     {
         /// <summary>

sdk/Lusid.Sdk/Model/ModelOptions.cs

@@ -32,6 +32,11 @@ namespace Lusid.Sdk.Model
     /// </summary>
     [DataContract(Name = "ModelOptions")]
     [JsonConverter(typeof(JsonSubtypes), "ModelOptionsType")]
+    [JsonSubtypes.KnownSubType(typeof(EmptyModelOptions), "EmptyModelOptions")]
+    [JsonSubtypes.KnownSubType(typeof(EquityModelOptions), "EquityModelOptions")]
+    [JsonSubtypes.KnownSubType(typeof(FxForwardModelOptions), "FxForwardModelOptions")]
+    [JsonSubtypes.KnownSubType(typeof(IndexModelOptions), "IndexModelOptions")]
+    [JsonSubtypes.KnownSubType(typeof(OpaqueModelOptions), "OpaqueModelOptions")]
     public partial class ModelOptions : IEquatable<ModelOptions>
     {
         /// <summary>

sdk/Lusid.Sdk/Model/ResultKeyRule.cs

@@ -32,6 +32,8 @@ namespace Lusid.Sdk.Model
     /// </summary>
     [DataContract(Name = "ResultKeyRule")]
     [JsonConverter(typeof(JsonSubtypes), "ResultKeyRuleType")]
+    [JsonSubtypes.KnownSubType(typeof(PortfolioResultDataKeyRule), "PortfolioResultDataKeyRule")]
+    [JsonSubtypes.KnownSubType(typeof(ResultDataKeyRule), "ResultDataKeyRule")]
     public partial class ResultKeyRule : IEquatable<ResultKeyRule>
     {
         /// <summary>