slapos_cloud: Move Mixin definitions to PortalTypeTypeMixin

       Use the proper way to include Mixin into a portal type

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>

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>

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>

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

master/bt5/slapos_cloud/bt/template_portal_type_type_mixin_list

@@ -4,3 +4,6 @@ Compute Node | SlapOSComputeNodeMixin
 Compute Partition | SlapOSCacheMixin
 Compute Partition | SlapOSComputePartitionMixin
 Person | SlapOSCacheMixin
+Slave Instance | SlapOSCacheMixin
+Software Installation | SlapOSCacheMixin
+Software Instance | SlapOSCacheMixin
\ No newline at end of file