Merge branch 'Sprint/2021-19' into 'master'

Sprint/2021 19

See merge request !15

src/OrganizationLoader/Program.cs

@@ -22,16 +22,19 @@ namespace Coscine.OrganizationLoader
             {
                 Name ="rds",
                 Quota = 25,
+                MaxQuota = 100,
                 HasQuota = true,
             },
             new ResourceType
             {  Name ="rdss3",
                 Quota = 0,
+                MaxQuota = 0,
                 HasQuota = true,
             },
             new ResourceType
             {  Name = "linked",
                Quota = -1,
+               MaxQuota = -1,
                HasQuota = false,
             },
         };
@@ -292,7 +295,8 @@ namespace Coscine.OrganizationLoader
                      new Organization
                      {
                          OrgId = node["OrgId"].InnerText?.Trim(),
-                         Name = node["Name"].InnerText?.Trim(),
+                         // IDM changed this to capital and might change it back. Keeps us safe for now.
+                         Name = (node["NAME"] ?? node["Name"]).InnerText?.Trim(),
                          IKZ = node["IKZ"].InnerText?.Trim(),
                          Abbreviation = node["Abbreviation"]?.InnerText?.Trim(),
                          CMSLink = node["CMSLink"].InnerText?.Trim(),
@@ -380,6 +384,7 @@ namespace Coscine.OrganizationLoader
                     if (resourceType.HasQuota)
                     {
                         streamWriter.WriteLine($@"    coscineresource:defaultQuota ""{resourceType.Quota}"";");
+                        streamWriter.WriteLine($@"    coscineresource:defaultMaxQuota ""{resourceType.MaxQuota}"";");
                     }
                     streamWriter.WriteLine("].");
                 }

src/OrganizationLoader/ResourceType.cs

@@ -4,6 +4,7 @@
     {
         public string Name { get; set; }
         public int Quota { get; set; }
+        public int MaxQuota { get; set; }
         public bool HasQuota { get; set; }
     }
 }