improved resources structures and coherence, fixed some bugs, added s…

…upport for discovery without selector

apis/advertisement/v1alpha1/discovery_types.go

@@ -32,7 +32,7 @@ type DiscoverySpec struct {
 
 	// This is the FlavourSelector that describes the characteristics of the intent that the solver is looking to satisfy
 	// This pattern corresponds to what has been defined in the REAR Protocol to do a discovery with a selector
-	Selector nodecorev1alpha1.FlavourSelector `json:"selector"`
+	Selector *nodecorev1alpha1.FlavourSelector `json:"selector"`
 
 	// This flag indicates that needs to be enstablished a subscription to the provider in case a match is found.
 	// In order to have periodic updates of the status of the matching Flavour

apis/nodecore/v1alpha1/common.go

@@ -45,9 +45,9 @@ type NodeIdentity struct {
 }
 
 // toString() returns a string representation of the GenericRef.
-func (r GenericRef) toString() string {
+/* func (r GenericRef) toString() string {
 	if r.Namespace != "" {
 		return r.Namespace + "/" + r.Name
 	}
 	return r.Name
-}
+} */

apis/nodecore/v1alpha1/solver_types.go

@@ -80,7 +80,7 @@ type RangeSelector struct {
 type SolverSpec struct {
 
 	// Selector contains the flavour requirements for the solver.
-	Selector FlavourSelector `json:"selector"`
+	Selector *FlavourSelector `json:"selector,omitempty"`
 
 	// IntentID is the ID of the intent that the Node Orchestrator is trying to solve.
 	// It is used to link the solver with the intent.

apis/reservation/v1alpha1/contract_types.go

@@ -41,7 +41,7 @@ type ContractSpec struct {
 
 	// The partition represents the dimension of the resources sold/bought.
 	// So it will reflect the dimension of the resources allocated on the remote cluster and reflected on the local virtual node.
-	Partition Partition `json:"partition,omitempty"`
+	Partition *Partition `json:"partition,omitempty"`
 
 	// This is the Node identity of the buyer FLUIDOS Node.
 	Buyer nodecorev1alpha1.NodeIdentity `json:"buyer"`

apis/reservation/v1alpha1/reservation_types.go

@@ -46,7 +46,7 @@ type ReservationSpec struct {
 	Seller nodecorev1alpha1.NodeIdentity `json:"seller"`
 
 	// Parition is the partition of the flavour that is being reserved
-	Partition Partition `json:"partition,omitempty"`
+	Partition *Partition `json:"partition,omitempty"`
 
 	// Reserve indicates if the reservation is a reserve or not
 	Reserve bool `json:"reserve,omitempty"`

apis/reservation/v1alpha1/transaction_types.go

@@ -31,7 +31,7 @@ type TransactionSpec struct {
 	ClusterID string `json:"clusterID"`
 
 	// Partition is the partition of the flavour that is being reserved
-	Partition Partition `json:"partition,omitempty"`
+	Partition *Partition `json:"partition,omitempty"`
 
 	// StartTime is the time at which the reservation should start
 	StartTime string `json:"startTime,omitempty"`

cmd/rear-controller/main.go

@@ -144,20 +144,39 @@ func main() {
 		os.Exit(1)
 	}
 
+	// Periodically clear the transaction cache
 	if err := mgr.Add(manager.RunnableFunc(gw.CacheRefresher(flags.REFRESH_CACHE_INTERVAL))); err != nil {
 		klog.Errorf("Unable to set up transaction cache refresher: %s", err)
 		os.Exit(1)
 	}
 
+	// Periodically check if Liqo is ready
+	if err := mgr.Add(manager.RunnableFunc(gw.LiqoChecker(flags.LIQO_CHECK_INTERVAL))); err != nil {
+		klog.Errorf("Unable to set up Liqo checker: %s", err)
+		os.Exit(1)
+	}
+
+	// Start the REAR Gateway HTTP server
+	if err := mgr.Add(manager.RunnableFunc(gw.Start)); err != nil {
+		klog.Errorf("Unable to set up Gateway HTTP server: %s", err)
+		os.Exit(1)
+	}
+
+	// Start the REAR GRPC server
+	if err := mgr.Add(manager.RunnableFunc(grpcServer.Start)); err != nil {
+		klog.Errorf("Unable to set up Gateway GRPC server: %s", err)
+		os.Exit(1)
+	}
+
 	// Start the REAR Gateway HTTP server
-	go func() {
-		gw.StartHttpServer()
-	}()
+	/* go func() {
+		gw.Start()
+	}() */
 
 	// Start the REAR GRPC server
-	go func() {
+	/* go func() {
 		grpcServer.Start()
-	}()
+	}() */
 
 	// TODO: Uncomment this when the webhook is ready. For now it does not work (Ale)
 	// pcv := discoverymanager.NewPCValidator(mgr.GetClient())

deployments/node/crds/nodecore.fluidos.eu_solvers.yaml

@@ -201,7 +201,6 @@ spec:
                 type: object
             required:
             - intentID
-            - selector
             type: object
           status:
             description: SolverStatus defines the observed state of Solver

deployments/node/files/fluidos-rear-controller-ClusterRole.yaml

@@ -59,6 +59,14 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - nodecore.fluidos.eu
   resources:

examples/kind/setup.sh

@@ -32,6 +32,8 @@ helm install node ../../deployments/node -n fluidos \
   --set networkManager.configMaps.nodeIdentity.ip=$consumer_controlplane_ip:$consumer_node_port \
   --set networkManager.configMaps.providers.local=$provider_controlplane_ip:$provider_node_port     
 
+liqoctl install kind --cluster-name fluidos-consumer
+
 export KUBECONFIG=$PWD/provider/config
 
 kubectl apply -f ../../deployments/node/crds
@@ -49,4 +51,6 @@ helm install node ../../deployments/node -n fluidos \
   --set networkManager.configMaps.nodeIdentity.ip=$provider_controlplane_ip:$provider_node_port \
   --set networkManager.configMaps.providers.local=$consumer_controlplane_ip:$consumer_node_port
 
+liqoctl install kind --cluster-name fluidos-provider
+
 

pkg/rear-controller/gateway/client.go

@@ -33,20 +33,28 @@ import (
 // TODO: move this function into the REAR Gateway package
 // reserveFlavour reserves a flavour with the given flavourID
 func (g *Gateway) ReserveFlavour(ctx context.Context, reservation *reservationv1alpha1.Reservation, flavourID string) (*models.Transaction, error) {
+	err := checkLiqoReadiness(g.LiqoReady)
+	if err != nil {
+		return nil, err
+	}
+
 	var transaction models.Transaction
 
 	body := models.ReserveRequest{
 		FlavourID: flavourID,
 		Buyer: models.NodeIdentity{
-			NodeID: reservation.Spec.Buyer.NodeID,
-			IP:     reservation.Spec.Buyer.IP,
-			Domain: reservation.Spec.Buyer.Domain,
+			NodeID: g.ID.NodeID,
+			IP:     g.ID.IP,
+			Domain: g.ID.Domain,
 		},
-		Partition: parseutil.ParsePartition(reservation.Spec.Partition),
 	}
 
 	klog.Infof("Reservation %s for flavour %s", reservation.Name, flavourID)
 
+	if reservation.Spec.Partition != nil {
+		body.Partition = parseutil.ParsePartition(reservation.Spec.Partition)
+	}
+
 	selectorBytes, err := json.Marshal(body)
 	if err != nil {
 		return nil, err
@@ -56,13 +64,13 @@ func (g *Gateway) ReserveFlavour(ctx context.Context, reservation *reservationv1
 	bodyBytes := bytes.NewBuffer(selectorBytes)
 	url := fmt.Sprintf("http://%s%s%s", reservation.Spec.Seller.IP, RESERVE_FLAVOUR_PATH, flavourID)
 
-	klog.Infof("Sending POST request to %s", url)
+	klog.Infof("Sending request to %s", url)
 
 	resp, err := makeRequest("POST", url, bodyBytes)
-	defer resp.Body.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()
 
 	// Check if the response status code is 200 (OK)
 	if resp.StatusCode != http.StatusOK {
@@ -82,7 +90,7 @@ func (g *Gateway) ReserveFlavour(ctx context.Context, reservation *reservationv1
 		return &transaction, fmt.Errorf("transactionID is empty")
 	}
 
-	klog.Infof("Flavour %s reserved: transaction %v", flavourID, transaction)
+	klog.Infof("Flavour %s reserved: transaction ID %s", flavourID, transaction.TransactionID)
 
 	g.addNewTransacion(transaction)
 
@@ -91,6 +99,11 @@ func (g *Gateway) ReserveFlavour(ctx context.Context, reservation *reservationv1
 
 // PurchaseFlavour purchases a flavour with the given flavourID
 func (g *Gateway) PurchaseFlavour(ctx context.Context, transactionID string, seller nodecorev1alpha1.NodeIdentity) (*models.ResponsePurchase, error) {
+	err := checkLiqoReadiness(g.LiqoReady)
+	if err != nil {
+		return nil, err
+	}
+
 	var purchase models.ResponsePurchase
 
 	// Check if the transaction exists
@@ -113,10 +126,10 @@ func (g *Gateway) PurchaseFlavour(ctx context.Context, transactionID string, sel
 	url := fmt.Sprintf("http://%s%s%s", seller.IP, PURCHASE_FLAVOUR_PATH, transactionID)
 
 	resp, err := makeRequest("POST", url, bodyBytes)
-	defer resp.Body.Close()
 	if err != nil {
 		return nil, err
 	}
+	defer resp.Body.Close()
 
 	// Check if the response status code is 200 (OK)
 	if resp.StatusCode != http.StatusOK {
@@ -131,18 +144,24 @@ func (g *Gateway) PurchaseFlavour(ctx context.Context, transactionID string, sel
 }
 
 // SearchFlavour is a function that returns an array of Flavour that fit the Selector by performing a get request to an http server
-func (g *Gateway) DiscoverFlavours(selector nodecorev1alpha1.FlavourSelector) ([]*nodecorev1alpha1.Flavour, error) {
-	// Marshal the selector into JSON bytes
-	s := parseutil.ParseFlavourSelector(selector)
+func (g *Gateway) DiscoverFlavours(selector *nodecorev1alpha1.FlavourSelector) ([]*nodecorev1alpha1.Flavour, error) {
+	err := checkLiqoReadiness(g.LiqoReady)
+	if err != nil {
+		return nil, err
+	}
 
-	// Create the Flavour CR from the first flavour in the array of Flavour
+	var s *models.Selector
 	var flavoursCR []*nodecorev1alpha1.Flavour
 
+	if selector == nil {
+		s = parseutil.ParseFlavourSelector(selector)
+	}
+
 	providers := getters.GetLocalProviders(context.Background(), g.client)
 
 	// Send the POST request to all the servers in the list
-	for _, ADDRESS := range providers {
-		flavour, err := searchFlavour(s, ADDRESS)
+	for _, provider := range providers {
+		flavour, err := discover(s, provider)
 		if err != nil {
 			klog.Errorf("Error when searching Flavour: %s", err)
 			return nil, err
@@ -153,3 +172,18 @@ func (g *Gateway) DiscoverFlavours(selector nodecorev1alpha1.FlavourSelector) ([
 	klog.Infof("Found %d flavours", len(flavoursCR))
 	return flavoursCR, nil
 }
+
+func discover(s *models.Selector, provider string) (*nodecorev1alpha1.Flavour, error) {
+	if s != nil {
+		return searchFlavourWithSelector(s, provider)
+	}
+	return searchFlavour(provider)
+}
+
+func checkLiqoReadiness(b bool) error {
+	if !b {
+		klog.Errorf("Liqo is not ready, please check or wait for the Liqo installation")
+		return fmt.Errorf("Liqo is not ready, please check or wait for the Liqo installation")
+	}
+	return nil
+}