Merge 1d1b5d5 into 96d4423

doc/dbus/bus/org.opensuse.Agama.Storage1.Proposal.bus.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/opensuse/Agama/Storage1/Proposal">
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg name="xml_data" direction="out" type="s"/>
+    </method>
+  </interface>
+  <interface name="org.freedesktop.DBus.Properties">
+    <method name="Get">
+      <arg name="interface_name" direction="in" type="s"/>
+      <arg name="property_name" direction="in" type="s"/>
+      <arg name="value" direction="out" type="v"/>
+    </method>
+    <method name="Set">
+      <arg name="interface_name" direction="in" type="s"/>
+      <arg name="property_name" direction="in" type="s"/>
+      <arg name="val" direction="in" type="v"/>
+    </method>
+    <method name="GetAll">
+      <arg name="interface_name" direction="in" type="s"/>
+      <arg name="value" direction="out" type="a{sv}"/>
+    </method>
+    <signal name="PropertiesChanged">
+      <arg name="interface" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
+    </signal>
+  </interface>
+  <interface name="org.opensuse.Agama.Storage1.Proposal">
+    <property type="s" name="BootDevice" access="read"/>
+    <property type="b" name="LVM" access="read"/>
+    <property type="aas" name="SystemVGDevices" access="read"/>
+    <property type="s" name="EncryptionPassword" access="read"/>
+    <property type="s" name="EncryptionMethod" access="read"/>
+    <property type="s" name="EncryptionPBKDFunction" access="read"/>
+    <property type="s" name="SpacePolicy" access="read"/>
+    <property type="aa{sv}" name="Volumes" access="read"/>
+    <property type="aa{sv}" name="Actions" access="read"/>
+  </interface>
+</node>

doc/dbus/bus/org.opensuse.Agama.Storage1.bus.xml

@@ -87,12 +87,16 @@
     <property type="b" name="IBFT" access="read"/>
   </interface>
   <interface name="org.opensuse.Agama.Storage1.Proposal.Calculator">
+    <method name="DefaultVolume">
+      <arg name="mount_path" direction="in" type="s"/>
+      <arg name="volume" direction="out" type="a{sv}"/>
+    </method>
     <method name="Calculate">
       <arg name="settings" direction="in" type="a{sv}"/>
       <arg name="result" direction="out" type="u"/>
     </method>
     <property type="ao" name="AvailableDevices" access="read"/>
-    <property type="aa{sv}" name="VolumeTemplates" access="read"/>
+    <property type="as" name="ProductMountPoints" access="read"/>
     <property type="o" name="Result" access="read"/>
   </interface>
   <interface name="org.opensuse.Agama.Storage1.ZFCP.Manager">

doc/dbus/org.opensuse.Agama.Storage1.Proposal.doc.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/opensuse/Agama/Storage1/Proposal">
+  <!--
+    Interfaces with the properties of the calculated proposal.
+  -->
+  <interface name="org.opensuse.Agama.Storage1.Proposal">
+    <property type="s" name="BootDevice" access="read"/>
+    <property type="b" name="LVM" access="read"/>
+    <property type="aas" name="SystemVGDevices" access="read"/>
+    <property type="s" name="EncryptionPassword" access="read"/>
+    <property type="s" name="EncryptionMethod" access="read"/>
+    <property type="s" name="EncryptionPBKDFunction" access="read"/>
+    <property type="s" name="SpacePolicy" access="read"/>
+    <!--
+      List of volumes used for calculating the proposal.
+      Each volume has the following properties:
+        MountPath               s
+        MountOptions            as
+        TargetDevice            s
+        TargetVG                s
+        FsType                  s
+        MinSize                 t
+        MaxSize                 t (optinal, max size is considered as unlimited if omitted)
+        AutoSize                b
+        Snapshots               b
+        Outline                 a{sv}
+          Required              b
+          FsTypes               as
+          SupportAutoSize       b
+          SnapshotsConfigurable b
+          SnapshotsAffectSizes  b
+          SizeRelevantVolumes   as
+    -->
+    <property type="aa{sv}" name="Volumes" access="read"/>
+    <!--
+      Actions to perform in the system in order to create the volumes.
+      Each action has the following properties:
+        Text    s
+        Subvol  b
+        Delete  b
+    -->
+    <property type="aa{sv}" name="Actions" access="read"/>
+  </interface>
+</node>

doc/dbus/org.opensuse.Agama.Storage1.doc.xml

@@ -22,4 +22,65 @@
     -->
     <property type="b" name="DeprecatedSystem" access="read"/>
   </interface>
+  <!--
+    Interface for calculating a new storage proposal.
+  -->
+  <interface name="org.opensuse.Agama.Storage1.Proposal.Calculator">
+    <!--
+      Gets the default values for a volume with the given mount path.
+    -->
+    <method name="DefaultVolume">
+      <!--
+        E.g., /home
+      -->
+      <arg name="mount_path" direction="in" type="s"/>
+      <!--
+        MountPath               s
+        MountOptions            as
+        TargetDevice            s
+        TargetVG                s
+        FsType                  s
+        MinSize                 t
+        MaxSize                 t (optinal, max size is considered as unlimited if omitted)
+        AutoSize                b
+        Snapshots               b
+        Outline                 a{sv}
+          Required              b
+          FsTypes               as
+          SupportAutoSize       b
+          SnapshotsConfigurable b
+          SnapshotsAffectSizes  b
+          SizeRelevantVolumes   as
+      -->
+      <arg name="volume" direction="out" type="a{sv}"/>
+    </method>
+    <!--
+      Calculates a new proposal.
+    -->
+    <method name="Calculate">
+    <!--
+      BootDevice              s
+      LVM                     b
+      SystemVGDevices         as
+      EncryptionPassword      s
+      EncryptionMethod        s
+      EncryptionPBKDFunction  s
+      SpacePolicy             s
+      SpaceActions            a{ss}
+      Volumes                 aa{sv}
+        List of volumes to create. The values for each volume are the same as the values returned
+        by DefaultVolume method. The Outline (if given) would be ignored.
+    -->
+      <arg name="settings" direction="in" type="a{sv}"/>
+      <arg name="result" direction="out" type="u"/>
+    </method>
+    <property type="ao" name="AvailableDevices" access="read"/>
+    <!--
+      Relevant mount points for the selected product. Normally, the product defines some specific
+      values for these mount points (e.g., min and max sizes, file system type, etc).
+    -->
+    <property type="as" name="ProductMountPoints" access="read"/>
+    <property type="o" name="Result" access="read"/>
+  </interface>
+
 </node>