Update for Mixin related XML Change

See merge request nexedi/slapos.core!502

Update for Mixin related XML Change
See merge request nexedi/slapos.core!502
b0561e00 · Rafael Monnerat · c19e62e2 · c57875f3 · b0561e00 · b0561e00
Commit b0561e00 authored Mar 25, 2023 by Rafael Monnerat
42 changed files
--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Cloud%20Contract%20Line.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Cloud%20Contract%20Line.xml
@@ -62,12 +62,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Cloud%20Contract%20Module.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Cloud%20Contract%20Module.xml
@@ -64,12 +64,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Cloud%20Contract.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Cloud%20Contract.xml
@@ -58,12 +58,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Computer%20Consumption%20TioXML%20File.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Computer%20Consumption%20TioXML%20File.xml
@@ -81,12 +81,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Consumption%20Document%20Module.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Consumption%20Document%20Module.xml
@@ -64,12 +64,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Causality%20Movement%20Group.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Root%20Applied%20Rule%20Causality%20Causality%20Movement%20Group.xml
@@ -70,12 +70,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/SlapOS%20Accounting%20Quantity%20Updating%20Order%20Builder.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/SlapOS%20Accounting%20Quantity%20Updating%20Order%20Builder.xml
@@ -100,12 +100,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule.xml
@@ -77,12 +77,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/User%20Consumption%20HTML%20File.xml
+++ b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/User%20Consumption%20HTML%20File.xml
@@ -81,12 +81,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Hosting%20Subscription.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Hosting%20Subscription.xml
@@ -104,12 +104,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Instance%20Tree.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Instance%20Tree.xml
@@ -104,12 +104,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Slave%20Instance.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Slave%20Instance.xml
@@ -102,14 +102,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple>
-                <string>SlapOSCacheMixin</string>
-              </tuple>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Installation.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Installation.xml
@@ -71,14 +71,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple>
-                <string>SlapOSCacheMixin</string>
-              </tuple>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance%20Module.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance%20Module.xml
@@ -114,12 +114,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTemplateItem/portal_types/Software%20Instance.xml
@@ -100,14 +100,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple>
-                <string>SlapOSCacheMixin</string>
-              </tuple>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_cloud/PortalTypeTypeMixinTemplateItem/type_mixin.xml
+++ b/master/bt5/slapos_cloud/PortalTypeTypeMixinTemplateItem/type_mixin.xml
@@ -13,4 +13,13 @@
 <portal_type id="Person">
  <item>SlapOSCacheMixin</item>
 </portal_type>
+ <portal_type id="Slave Instance">
+  <item>SlapOSCacheMixin</item>
+ </portal_type>
+ <portal_type id="Software Installation">
+  <item>SlapOSCacheMixin</item>
+ </portal_type>
+ <portal_type id="Software Instance">
+  <item>SlapOSCacheMixin</item>
+ </portal_type>
 </type_mixin>
\ No newline at end of file
--- a/master/bt5/slapos_cloud/bt/template_portal_type_type_mixin_list
+++ b/master/bt5/slapos_cloud/bt/template_portal_type_type_mixin_list
@@ -3,4 +3,7 @@ Compute Node | SlapOSCacheMixin
 Compute Node | SlapOSComputeNodeMixin
 Compute Partition | SlapOSCacheMixin
 Compute Partition | SlapOSComputePartitionMixin
-Person | SlapOSCacheMixin
\ No newline at end of file
+Person | SlapOSCacheMixin
+Slave Instance | SlapOSCacheMixin
+Software Installation | SlapOSCacheMixin
+Software Instance | SlapOSCacheMixin
\ No newline at end of file
--- a/master/bt5/slapos_crm/PortalTypeTemplateItem/portal_types/Incident%20Response.xml
+++ b/master/bt5/slapos_crm/PortalTypeTemplateItem/portal_types/Incident%20Response.xml
@@ -58,12 +58,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_crm/PortalTypeTemplateItem/portal_types/Regularisation%20Request.xml
+++ b/master/bt5/slapos_crm/PortalTypeTemplateItem/portal_types/Regularisation%20Request.xml
@@ -56,12 +56,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Certificate%20Authority%20Tool.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Certificate%20Authority%20Tool.xml
@@ -91,12 +91,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Contract%20Invitation%20Token.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Contract%20Invitation%20Token.xml
@@ -52,12 +52,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Document%20Module.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Document%20Module.xml
@@ -87,12 +87,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/File.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/File.xml
@@ -112,12 +112,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Image%20Module.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Image%20Module.xml
@@ -87,12 +87,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Image.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Image.xml
@@ -89,12 +89,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token%20Module.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token%20Module.xml
@@ -64,12 +64,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Invitation%20Token.xml
@@ -52,12 +52,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Organisation%20Module.xml
@@ -87,12 +87,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Person%20Module.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Person%20Module.xml
@@ -87,12 +87,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Query.xml
+++ b/master/bt5/slapos_erp5/PortalTypeTemplateItem/portal_types/Query.xml
@@ -93,12 +93,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_payzen/PortalTypeTemplateItem/portal_types/Payzen%20Event%20Message.xml
+++ b/master/bt5/slapos_payzen/PortalTypeTemplateItem/portal_types/Payzen%20Event%20Message.xml
@@ -81,12 +81,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_payzen/PortalTypeTemplateItem/portal_types/Payzen%20Event.xml
+++ b/master/bt5/slapos_payzen/PortalTypeTemplateItem/portal_types/Payzen%20Event.xml
@@ -81,12 +81,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Software%20Product%20Individual%20Variation.xml
+++ b/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Software%20Product%20Individual%20Variation.xml
@@ -68,12 +68,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Upgrade%20Decision%20Line.xml
+++ b/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Upgrade%20Decision%20Line.xml
@@ -56,12 +56,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Upgrade%20Decision%20Module.xml
+++ b/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Upgrade%20Decision%20Module.xml
@@ -68,12 +68,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Upgrade%20Decision.xml
+++ b/master/bt5/slapos_pdm/PortalTypeTemplateItem/portal_types/Upgrade%20Decision.xml
@@ -56,12 +56,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_slap_tool/PortalTypeTemplateItem/portal_types/Slap%20Tool.xml
+++ b/master/bt5/slapos_slap_tool/PortalTypeTemplateItem/portal_types/Slap%20Tool.xml
@@ -67,12 +67,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_subscription_request/PortalTypeTemplateItem/portal_types/Subscription%20Condition.xml
+++ b/master/bt5/slapos_subscription_request/PortalTypeTemplateItem/portal_types/Subscription%20Condition.xml
@@ -52,12 +52,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_subscription_request/PortalTypeTemplateItem/portal_types/Subscription%20Request.xml
+++ b/master/bt5/slapos_subscription_request/PortalTypeTemplateItem/portal_types/Subscription%20Request.xml
@@ -58,12 +58,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_wechat/PortalTypeTemplateItem/portal_types/Wechat%20Event%20Message.xml
+++ b/master/bt5/slapos_wechat/PortalTypeTemplateItem/portal_types/Wechat%20Event%20Message.xml
@@ -81,12 +81,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_wechat/PortalTypeTemplateItem/portal_types/Wechat%20Event.xml
+++ b/master/bt5/slapos_wechat/PortalTypeTemplateItem/portal_types/Wechat%20Event.xml
@@ -81,12 +81,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>

--- a/master/bt5/slapos_wechat/PortalTypeTemplateItem/portal_types/Wechat%20Service.xml
+++ b/master/bt5/slapos_wechat/PortalTypeTemplateItem/portal_types/Wechat%20Service.xml
@@ -71,12 +71,6 @@
              <tuple/>
            </value>
        </item>
-        <item>
-            <key> <string>type_mixin</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
      </dictionary>
    </pickle>
  </record>