sdl: lookup pricing by compute profile name

 * add `akash deployment validate <deployment.yml>`
 * use micro akash instead of milli akash

fixes #339

Author: boz

_docs/deployment.yml

@@ -74,17 +74,16 @@ profiles:
       attributes:
         region: us-west
       pricing:
-        web: .001
-        db-master: 0.05
-        db-slave: 0.05
-        db-pool: 0.03
+        web: 0.000010
+        db:  0.000050
+        db-pool: 0.000030
     eastcoast:
       attributes:
         region: us-east
       pricing:
-        web: .003
-        db-slave: 0.06
-        db-pool: 0.04
+        web: 0.000030
+        db:  0.000060
+        db-pool: 0.000040
 
 deployment:
 

_integration/cmp/account.go

@@ -1,7 +1,7 @@
 package cmp
 
 import (
-	"strconv"
+	"fmt"
 
 	"github.com/ovrclk/gestalt"
 	g "github.com/ovrclk/gestalt/builder"
@@ -18,8 +18,9 @@ func accountBalance(key key, amount int64) gestalt.Component {
 }
 
 func accountSendTo(from key, to key, amount int64) gestalt.Component {
+	value := fmt.Sprintf("%0.06f", float64(amount)/float64(1000000))
 	return akash("send-to",
-		"send", strconv.FormatInt(amount, 10), to.addr.Var(), "-k", from.name.Name()).
+		"send", value, to.addr.Var(), "-k", from.name.Name()).
 		WithMeta(g.Require(to.addr.Name()))
 }
 
@@ -32,6 +33,6 @@ func groupAccountSend(key key) gestalt.Component {
 		Run(accountBalance(key, start)).
 		Run(accountSendTo(key, other, amount)).
 		Run(g.Retry(5).
-			Run(accountBalance(key, start-1000*amount))).
-		Run(accountBalance(other, 1000*amount))
+			Run(accountBalance(key, start-amount))).
+		Run(accountBalance(other, amount))
 }

_run/kube/deployment.yml

@@ -24,7 +24,7 @@ profiles:
       attributes:
         region: us-west
       pricing:
-        web: .101
+        web: .002000
 
 deployment:
   web:

_run/multi/deployment.yml

@@ -24,7 +24,7 @@ profiles:
       attributes:
         region: us-west
       pricing:
-        web: .1
+        web: .000100
 
 deployment:
   web:

cmd/akash/deployment.go

@@ -32,6 +32,7 @@ func deploymentCommand() *cobra.Command {
 	cmd.AddCommand(closeDeploymentCommand())
 	cmd.AddCommand(statusDeploymentCommand())
 	cmd.AddCommand(sendManifestCommand())
+	cmd.AddCommand(validateDeploymentCommand())
 
 	return cmd
 }
@@ -371,6 +372,26 @@ func sendManifest(session session.Session, cmd *cobra.Command, args []string) er
 	return doSendManifest(session, signer, depAddr.ID(), mani)
 }
 
+func validateDeploymentCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "validate <deployment-file>",
+		Short: "validate deployment file",
+		Args:  cobra.ExactArgs(1),
+		RunE:  session.WithSession(doValidateDeploymentCommand),
+	}
+
+	return cmd
+}
+
+func doValidateDeploymentCommand(session session.Session, cmd *cobra.Command, args []string) error {
+	_, err := sdl.ReadFile(args[0])
+	if err != nil {
+		return err
+	}
+	fmt.Println("ok")
+	return nil
+}
+
 func manifestValidateResources(session session.Session, mani *types.Manifest, daddr []byte) error {
 	dgroups, err := session.QueryClient().DeploymentGroupsForDeployment(session.Ctx(), daddr)
 	if err != nil {

denom/denom.go

@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	miliAkashPerAkash = 1000
+	microAkashPerAkash = 1000000
 )
 
 // ToBase converts a unit of currency to its equivalent value in base denomination
@@ -14,6 +14,6 @@ func ToBase(sval string) (uint64, error) {
 	if err != nil {
 		return 0, err
 	}
-	amount := akash * miliAkashPerAkash
+	amount := akash * microAkashPerAkash
 	return uint64(amount), nil
 }

sdl/_testdata/profile-svc-name-mismatch.yml

@@ -0,0 +1,30 @@
+---
+version: "1.0"
+
+services:
+  webapp:
+    image: quay.io/ovrclk/demo-app
+    expose:
+      - port: 80
+        as: 80
+        to:
+          - global: true
+
+profiles:
+  compute:
+    web:
+      cpu: "100m"
+      memory: "512Mi"
+      disk: "512Mi"
+  placement:
+    san-jose:
+      attributes:
+        region: sjc
+      pricing:
+        web: 0.000025
+
+deployment:
+  webapp:
+    san-jose:
+      profile: web
+      count: 1

sdl/_testdata/simple.yml

@@ -22,7 +22,7 @@ profiles:
       attributes:
         region: us-west
       pricing:
-        web: .8
+        web: 0.005000
 
 deployment:
   web:

sdl/v1.go

@@ -119,9 +119,9 @@ func (sdl *v1) DeploymentGroups() ([]*types.GroupSpec, error) {
 				return nil, fmt.Errorf("%v.%v: no placement profile named %v", svcName, placementName, placementName)
 			}
 
-			price, ok := infra.Pricing[svcName]
+			price, ok := infra.Pricing[svcdepl.Profile]
 			if !ok {
-				return nil, fmt.Errorf("%v.%v: no pricing for service %v", svcName, placementName, svcName)
+				return nil, fmt.Errorf("%v.%v: no pricing for profile %v", svcName, placementName, svcdepl.Profile)
 			}
 
 			group := groups[placementName]

sdl/v1_test.go

@@ -40,7 +40,7 @@ func Test_v1_Parse_simple(t *testing.T) {
 
 	assert.Equal(t, types.ResourceGroup{
 		Count: 2,
-		Price: 800,
+		Price: 0x1388,
 		Unit: types.ResourceUnit{
 			CPU:    100,
 			Memory: 128 * unit.Mi,
@@ -73,3 +73,16 @@ func Test_v1_Parse_simple(t *testing.T) {
 	}, mani.GetGroups()[0])
 
 }
+
+func Test_v1_Parse_ProfileNameNotServiceName(t *testing.T) {
+	sdl, err := sdl.ReadFile("./_testdata/profile-svc-name-mismatch.yml")
+	require.NoError(t, err)
+
+	dgroups, err := sdl.DeploymentGroups()
+	require.NoError(t, err)
+	assert.Len(t, dgroups, 1)
+
+	mani, err := sdl.Manifest()
+	require.NoError(t, err)
+	assert.Len(t, mani.Groups, 1)
+}