Merge pull request #637 from codescalers/development_mycelium

support mycelium in server and client

Author: rawdaGastan

client/src/views/K8s.vue

@@ -171,6 +171,12 @@
                 @click="copyIP(item.master.ygg_ip)"
               >
                 {{ item.master.ygg_ip }}
+              </td>
+							<td
+                class="cursor-pointer"
+                @click="copyIP(item.master.mycelium_ip)"
+              >
+                {{ item.master.mycelium_ip }}
               </td>
               <td
                 v-if="item.master.public_ip"
@@ -205,7 +211,7 @@
           </template>
         </v-data-table>
         <v-dialog transition="dialog-top-transition" v-model="dialog">
-          <v-card width="50%" class="mx-auto">
+          <v-card width="60%" class="mx-auto">
             <v-toolbar color="transparent">
               <v-spacer></v-spacer>
               <v-toolbar-items>
@@ -302,6 +308,11 @@ export default {
         key: "ygg_ip",
         sortable: false,
       },
+      {
+        title: "Mycelium IP",
+        key: "mycelium_ip",
+        sortable: false,
+      },
       {
         title: "Public IP",
         key: "public_ip",
@@ -337,10 +348,15 @@ export default {
         sortable: false,
       },
       {
-        title: "Resources",
-        key: "resources",
+        title: "Yggdrasil IP",
+        key: "ygg_ip",
         sortable: false,
       },
+      {
+        title: "Mycelium IP",
+        key: "mycelium_ip",
+        sortable: false,
+      }
     ]);
     const resources = ref([
       { title: "Small K8s (1 CPU, 2GB, 25GB)", value: "small" },

client/src/views/VM.vue

@@ -71,6 +71,9 @@
                   <td class="cursor-pointer" @click="copyIP(item.ygg_ip)">
                     {{ item.ygg_ip }}
                   </td>
+                  <td class="cursor-pointer" @click="copyIP(item.mycelium_ip)">
+                    {{ item.mycelium_ip }}
+                  </td>
                   <td
                     v-if="item.public_ip"
                     class="cursor-pointer"
@@ -172,6 +175,11 @@ export default {
         key: "ygg_ip",
         sortable: false,
       },
+      {
+        title: "Mycelium IP",
+        key: "mycelium_ip",
+        sortable: false,
+      },
       {
         title: "Public IP",
         key: "public_ip",

server/deployer/deployer.go

@@ -164,16 +164,22 @@ func (d *Deployer) CancelDeployment(contractID uint64, netContractID uint64, dlT
 	return nil
 }
 
-func buildNetwork(node uint32, name string) workloads.ZNet {
+func buildNetwork(node uint32, name string) (workloads.ZNet, error) {
+	myceliumKey, err := workloads.RandomMyceliumKey()
+	if err != nil {
+		return workloads.ZNet{}, err
+	}
+
 	return workloads.ZNet{
 		Name:  name,
 		Nodes: []uint32{node},
 		IPRange: workloads.NewIPRange(net.IPNet{
 			IP:   net.IPv4(10, 20, 0, 0),
 			Mask: net.CIDRMask(16, 32),
 		}),
-		AddWGAccess: false,
-	}
+		AddWGAccess:  false,
+		MyceliumKeys: map[uint32][]byte{node: myceliumKey},
+	}, nil
 }
 
 func calcNodeResources(resources string, public bool) (uint64, uint64, uint64, uint64, error) {

server/deployer/k8s_deployer.go

@@ -18,19 +18,27 @@ import (
 )
 
 func buildK8sCluster(node uint32, sshKey, network string, k models.K8sDeployInput) (workloads.K8sCluster, error) {
+	myceliumIPSeed, err := workloads.RandomMyceliumIPSeed()
+	if err != nil {
+		return workloads.K8sCluster{}, err
+	}
+
 	master := workloads.K8sNode{
 		VM: &workloads.VM{
-			Name:        k.MasterName,
-			Flist:       k8sFlist,
-			Planetary:   true,
-			NodeID:      node,
-			NetworkName: network,
+			Name:           k.MasterName,
+			Flist:          k8sFlist,
+			Planetary:      true,
+			MyceliumIPSeed: myceliumIPSeed,
+			NodeID:         node,
+			NetworkName:    network,
 		},
 	}
+
 	cru, mru, sru, ips, err := calcNodeResources(k.Resources, k.Public)
 	if err != nil {
 		return workloads.K8sCluster{}, err
 	}
+
 	master.CPU = uint8(cru)
 	master.MemoryMB = mru * 1024
 	master.DiskSizeGB = sru
@@ -40,23 +48,33 @@ func buildK8sCluster(node uint32, sshKey, network string, k models.K8sDeployInpu
 
 	workers := []workloads.K8sNode{}
 	for _, worker := range k.Workers {
+		myceliumIPSeed, err := workloads.RandomMyceliumIPSeed()
+		if err != nil {
+			return workloads.K8sCluster{}, err
+		}
+
 		w := workloads.K8sNode{
 			VM: &workloads.VM{
-				Name:        worker.Name,
-				Flist:       k8sFlist,
-				NodeID:      node,
-				NetworkName: network,
+				Name:           worker.Name,
+				Flist:          k8sFlist,
+				NodeID:         node,
+				NetworkName:    network,
+				Planetary:      true,
+				MyceliumIPSeed: myceliumIPSeed,
 			},
 		}
+
 		cru, mru, sru, _, err := calcNodeResources(k.Resources, false)
 		if err != nil {
 			return workloads.K8sCluster{}, err
 		}
+
 		w.CPU = uint8(cru)
 		w.MemoryMB = mru * 1024
 		w.DiskSizeGB = sru
 		workers = append(workers, w)
 	}
+
 	k8sCluster := workloads.K8sCluster{
 		Master:       &master,
 		Workers:      workers,
@@ -77,7 +95,10 @@ func (d *Deployer) deployK8sClusterWithNetwork(ctx context.Context, k8sDeployInp
 	}
 
 	// build network
-	network := buildNetwork(node, fmt.Sprintf("%sk8sNet", k8sDeployInput.MasterName))
+	network, err := buildNetwork(node, fmt.Sprintf("%sk8sNet", k8sDeployInput.MasterName))
+	if err != nil {
+		return 0, 0, 0, err
+	}
 
 	// build cluster
 	cluster, err := buildK8sCluster(node,
@@ -128,29 +149,36 @@ func (d *Deployer) loadK8s(ctx context.Context, k8sDeployInput models.K8sDeployI
 	if err != nil {
 		return models.K8sCluster{}, err
 	}
+
 	master := models.Master{
-		CRU:       cru,
-		MRU:       mru,
-		SRU:       sru,
-		Public:    k8sDeployInput.Public,
-		PublicIP:  resCluster.Master.ComputedIP,
-		Name:      k8sDeployInput.MasterName,
-		YggIP:     resCluster.Master.PlanetaryIP,
-		Resources: k8sDeployInput.Resources,
+		CRU:        cru,
+		MRU:        mru,
+		SRU:        sru,
+		Public:     k8sDeployInput.Public,
+		PublicIP:   resCluster.Master.ComputedIP,
+		Name:       k8sDeployInput.MasterName,
+		YggIP:      resCluster.Master.PlanetaryIP,
+		MyceliumIP: resCluster.Master.MyceliumIP,
+		Resources:  k8sDeployInput.Resources,
 	}
-	workers := []models.Worker{}
-	for _, worker := range k8sDeployInput.Workers {
 
+	workers := []models.Worker{}
+	for i, worker := range k8sDeployInput.Workers {
 		cru, mru, sru, _, err := calcNodeResources(worker.Resources, false)
 		if err != nil {
 			return models.K8sCluster{}, err
 		}
+
 		workerModel := models.Worker{
-			Name:      worker.Name,
-			CRU:       cru,
-			MRU:       mru,
-			SRU:       sru,
-			Resources: worker.Resources,
+			Name:       worker.Name,
+			CRU:        cru,
+			MRU:        mru,
+			SRU:        sru,
+			Public:     k8sDeployInput.Public,
+			PublicIP:   resCluster.Workers[i].ComputedIP,
+			YggIP:      resCluster.Workers[i].PlanetaryIP,
+			MyceliumIP: resCluster.Workers[i].MyceliumIP,
+			Resources:  worker.Resources,
 		}
 		workers = append(workers, workerModel)
 	}

server/deployer/vms_deployer.go

@@ -43,22 +43,31 @@ func (d *Deployer) deployVM(ctx context.Context, vmInput models.DeployVMInput, s
 	nodeID := uint32(nodeIDs[0].NodeID)
 
 	// create network workload
-	network := buildNetwork(nodeID, fmt.Sprintf("%svmNet", vmInput.Name))
+	network, err := buildNetwork(nodeID, fmt.Sprintf("%svmNet", vmInput.Name))
+	if err != nil {
+		return nil, 0, 0, 0, err
+	}
 
 	// create disk
 	disk := workloads.Disk{
 		Name:   "disk",
 		SizeGB: sru,
 	}
 
+	myceliumIPSeed, err := workloads.RandomMyceliumIPSeed()
+	if err != nil {
+		return nil, 0, 0, 0, err
+	}
+
 	// create vm workload
 	vm := workloads.VM{
-		Name:      vmInput.Name,
-		Flist:     vmFlist,
-		CPU:       uint8(*filter.TotalCRU),
-		PublicIP:  vmInput.Public,
-		Planetary: true,
-		MemoryMB:  mru * 1024,
+		Name:           vmInput.Name,
+		Flist:          vmFlist,
+		CPU:            uint8(*filter.TotalCRU),
+		PublicIP:       vmInput.Public,
+		Planetary:      true,
+		MyceliumIPSeed: myceliumIPSeed,
+		MemoryMB:       mru * 1024,
 		Mounts: []workloads.Mount{
 			{Name: disk.Name, MountPoint: "/disk"},
 		},
@@ -143,6 +152,7 @@ func (d *Deployer) deployVMRequest(ctx context.Context, user models.User, input
 		UserID:            user.ID.String(),
 		Name:              vm.Name,
 		YggIP:             vm.PlanetaryIP,
+		MyceliumIP:        vm.MyceliumIP,
 		Resources:         input.Resources,
 		Public:            input.Public,
 		PublicIP:          vm.ComputedIP,

server/models/k8s.go

@@ -13,23 +13,28 @@ type K8sCluster struct {
 
 // Master struct for kubernetes master data
 type Master struct {
-	ClusterID int    `json:"clusterID"`
-	Name      string `json:"name" gorm:"unique" binding:"required"`
-	CRU       uint64 `json:"cru"`
-	MRU       uint64 `json:"mru"`
-	SRU       uint64 `json:"sru"`
-	YggIP     string `json:"ygg_ip"`
-	Public    bool   `json:"public"`
-	PublicIP  string `json:"public_ip"`
-	Resources string `json:"resources"`
+	ClusterID  int    `json:"clusterID"`
+	Name       string `json:"name" gorm:"unique" binding:"required"`
+	CRU        uint64 `json:"cru"`
+	MRU        uint64 `json:"mru"`
+	SRU        uint64 `json:"sru"`
+	YggIP      string `json:"ygg_ip"`
+	MyceliumIP string `json:"mycelium_ip"`
+	Public     bool   `json:"public"`
+	PublicIP   string `json:"public_ip"`
+	Resources  string `json:"resources"`
 }
 
 // Worker struct for k8s workers data
 type Worker struct {
-	ClusterID int    `json:"clusterID"`
-	Name      string `json:"name"`
-	CRU       uint64 `json:"cru"`
-	MRU       uint64 `json:"mru"`
-	SRU       uint64 `json:"sru"`
-	Resources string `json:"resources"`
+	ClusterID  int    `json:"clusterID"`
+	Name       string `json:"name"`
+	CRU        uint64 `json:"cru"`
+	MRU        uint64 `json:"mru"`
+	SRU        uint64 `json:"sru"`
+	YggIP      string `json:"ygg_ip"`
+	MyceliumIP string `json:"mycelium_ip"`
+	Public     bool   `json:"public"`
+	PublicIP   string `json:"public_ip"`
+	Resources  string `json:"resources"`
 }

server/models/vm.go

@@ -7,6 +7,7 @@ type VM struct {
 	UserID            string `json:"user_id"`
 	Name              string `json:"name" gorm:"unique" binding:"required"`
 	YggIP             string `json:"ygg_ip"`
+	MyceliumIP        string `json:"mycelium_ip"`
 	Public            bool   `json:"public"`
 	PublicIP          string `json:"public_ip"`
 	Resources         string `json:"resources"`