Migrated CustomerLicense to SoftwareLicense

src/Common/CustomerPortalClient.cs

@@ -392,15 +392,15 @@ public async Task<bool> CheckCustomerEnvironmentConnectionStatus(long? definitio
         }
 
         /// <inheritdoc/>
-        public async Task<CustomerEnvironmentApplicationPackage> CreateOrUpdateAppInstallation(long customerEnvironmentId, string appName, string appVersion, string parameters, string customerLicenseName)
+        public async Task<CustomerEnvironmentApplicationPackage> CreateOrUpdateAppInstallation(long customerEnvironmentId, string appName, string appVersion, string parameters, string softwareLicenseName)
         {
             return (await new CreateOrUpdateAppInstallationInput()
             {
                 CustomerEnvironmentId = customerEnvironmentId,
                 ApplicationPackageName = appName,
                 AppVersion = appVersion,
                 Parameters = parameters,
-                CustomerLicenseName = customerLicenseName
+                SoftwareLicenseName = softwareLicenseName
             }.CreateOrUpdateAppInstallationAsync(true)).CustomerEnvironmentApplicationPackage;
         }
 

src/Common/Handlers/NewEnvironmentHandler.cs

@@ -1,17 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using Cmf.CustomerPortal.BusinessObjects;
+using Cmf.CustomerPortal.Common.Deployment;
 using Cmf.CustomerPortal.Orchestration.CustomerEnvironmentManagement.InputObjects;
 using Cmf.CustomerPortal.Sdk.Common.Services;
 using Cmf.Foundation.BusinessObjects;
 using Cmf.Foundation.BusinessOrchestration.EntityTypeManagement.InputObjects;
 using Cmf.Foundation.BusinessOrchestration.GenericServiceManagement.InputObjects;
 using Cmf.Foundation.Common.Licenses.Enums;
 using Cmf.LightBusinessObjects.Infrastructure.Errors;
-using System.Linq;
-using Cmf.CustomerPortal.Common.Deployment;
 
 namespace Cmf.CustomerPortal.Sdk.Common.Handlers
 {
@@ -92,8 +92,8 @@
                     environment.Description = description;
                 }
 
                 environment.DeploymentPackage = isInfrastructureAgent || string.IsNullOrWhiteSpace(deploymentPackageName) ? environment.DeploymentPackage : await _customerPortalClient.GetObjectByName<DeploymentPackage>(deploymentPackageName);
-                environment.CustomerLicense = isInfrastructureAgent || string.IsNullOrWhiteSpace(licenseName) ? environment.CustomerLicense : await _customerPortalClient.GetObjectByName<CustomerLicense>(licenseName);
+                environment.SoftwareLicense = isInfrastructureAgent || string.IsNullOrWhiteSpace(licenseName) ? environment.SoftwareLicense : await Utils.GetLicenseByUniqueName(licenseName);
                 environment.DeploymentTarget = _newEnvironmentUtilities.GetDeploymentTargetValue(target);
                 environment.ChangeSet = null;
 
@@ -190,10 +190,10 @@
                     Description = description,
                     Parameters = rawParameters,
                     EnvironmentType = environmentType.ToString(),
                     DeploymentPackage = isInfrastructureAgent ? null : await _customerPortalClient.GetObjectByName<DeploymentPackage>(deploymentPackageName),
                     DeploymentTarget = _newEnvironmentUtilities.GetDeploymentTargetValue(target),
                     Site = environmentSite,
-                    CustomerLicense = isInfrastructureAgent ? null : await _customerPortalClient.GetObjectByName<CustomerLicense>(licenseName)
+                    SoftwareLicense = isInfrastructureAgent ? null : await Utils.GetLicenseByUniqueName(licenseName)
                 };
 
                 // check environment connection
@@ -218,8 +218,8 @@
                     EnvironmentType = environmentType.ToString(),
                     Site = isInfrastructureAgent ? null : await _customerPortalClient.GetObjectByName<ProductSite>(siteName),
                     Name = name,
                     DeploymentPackage = isInfrastructureAgent ? null : await _customerPortalClient.GetObjectByName<DeploymentPackage>(deploymentPackageName),
-                    CustomerLicense = isInfrastructureAgent ? null : await _customerPortalClient.GetObjectByName<CustomerLicense>(licenseName),
+                    SoftwareLicense = isInfrastructureAgent ? null : await Utils.GetLicenseByUniqueName(licenseName),
                     DeploymentTarget = _newEnvironmentUtilities.GetDeploymentTargetValue(target),
                     Parameters = rawParameters
                 };

src/Common/ICustomerPortalClient.cs

@@ -92,9 +92,9 @@ public interface ICustomerPortalClient
         /// <param name="appName">Name of the ApplicationPackage.</param>
         /// <param name="appVersion">Version of the ApplicationPackage.</param>
         /// <param name="parameters">Deployment parameters for the CustomerEnvironmentApplicationPackage.</param>
-        /// <param name="customerLicenseName">Name of a CustomerLicense.</param>
+        /// <param name="softwareLicenseName">Name of a SoftwareLicense.</param>
         /// <returns>The CustomerEnvironmentApplicationPackage relation.</returns>
-        Task<CustomerEnvironmentApplicationPackage> CreateOrUpdateAppInstallation(long customerEnvironmentId, string appName, string appVersion, string parameters, string customerLicenseName);
+        Task<CustomerEnvironmentApplicationPackage> CreateOrUpdateAppInstallation(long customerEnvironmentId, string appName, string appVersion, string parameters, string softwareLicenseName);
 
         /// <summary>
         /// Check the Deployment connection to verify if the deployment of an environment/app can occur.

src/Common/Utils.cs

@@ -1,7 +1,12 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using Cmf.CustomerPortal.BusinessObjects;
+using Cmf.Foundation.BusinessObjects.QueryObject;
+using Cmf.Foundation.BusinessOrchestration.GenericServiceManagement.InputObjects;
+using Cmf.Foundation.Common;
 
 namespace Cmf.CustomerPortal.Sdk.Common
 {
@@ -85,5 +90,33 @@
                 return tokens;
             });
         }
+
+        /// <summary>
+        /// Name of SoftwareLicense is not unique, since it is a versioned entity
+        /// To load a license by name, we need to get it by the LicenseUniqueName
+        /// </summary>
+        /// <param name="licenseUniqueName"></param>
+        /// <returns></returns>
+        public static async Task<CPSoftwareLicense> GetLicenseByUniqueName(string licenseUniqueName)
+        {
+            FilterCollection fcCollection = new FilterCollection()
+            {
+                new Filter()
+                {
+                    Name = "LicenseUniqueName",
+                    LogicalOperator = LogicalOperator.AND,
+                    Operator = FieldOperator.IsEqualTo,
+                    Value = licenseUniqueName
+                }
+            };
+
+            GetObjectsByFilterInput gobfiInput = new GetObjectsByFilterInput
+            {
+                Filter = fcCollection,
+                Type = Activator.CreateInstance<CPSoftwareLicense>()
+            };
+
+            return (CPSoftwareLicense)gobfiInput.GetObjectsByFilterSync().Instance[0];
+        }
     }
 }