reverted accidental changes

Author: mbongard

main.go

@@ -1,47 +1,111 @@
 package main
 
 import (
-	"context"
-	"encoding/json"
+	"bufio"
 	"fmt"
 	"log"
 	"os"
 
-	"github.com/jalapeno-api-gateway/protorepo-jagw-go/jagw"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
+	"github.com/jalapeno-api-gateway/demo-sr-app/fetch"
+	"github.com/jalapeno-api-gateway/protorepo-jagw-go/jagw"
 )
 
 func main() {
-	// Get Endpoint as <ip-address>:<port> using the parameters passed by the user
-	endpoint := fmt.Sprintf("%s:%s", os.Args[1], os.Args[2]) 
+	log.Print("Starting SR-App.")
+
+	// Get Endpoints
+	rsEndpoint := getRequestServiceEndpoint()
+	ssEndpoint := getSubscriptionServiceEndpoint()
 
 	// Setup Request Service Connection
-	var connection *grpc.ClientConn
-	connection, err := grpc.Dial(endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()))
-	if err != nil {
-		log.Fatalf("Failed to setup request service connection: %s", err)
+	var rsConnection *grpc.ClientConn
+	rsConnection, rsErr := grpc.Dial(rsEndpoint, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if rsErr != nil {
+		log.Fatalf("Failed to setup request service connection: %s", rsErr)
 	}
-	defer connection.Close()
+	defer rsConnection.Close()
 
-	// Create Client
-	client := jagw.NewRequestServiceClient(connection)
-
-	// Request all Nodes
-	request := &jagw.TopologyRequest{
-		Keys: []string{},
-		Properties: []string{},
+	// Setup Subscription Service Connection
+	var ssConnection *grpc.ClientConn
+	ssConnection, ssErr := grpc.Dial(ssEndpoint, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if ssErr != nil {
+		log.Fatalf("Failed to setup subscription service connection: %s", ssErr)
 	}
+	defer ssConnection.Close()
 
-	response, err := client.GetLsNodes(context.Background(), request)
-	if err != nil {
-		log.Fatalf("Error when calling GetLsNodes on request service: %s", err)
-	}
+	// Create Clients
+	rsClient := jagw.NewRequestServiceClient(rsConnection)
+	ssClient := jagw.NewSubscriptionServiceClient(ssConnection)
 
-	prettyPrint(response)
+	// Demo requests and subscriptions
+	makeTopologyRequests(rsClient)
+	makeTelemetryRequests(rsClient)
+	makeTopologySubscriptions(ssClient)
+	makeTelemetrySubscriptions(ssClient)
 }
 
-func prettyPrint(any interface{}) {
-	s, _ := json.MarshalIndent(any, "", "  ")
-	fmt.Printf("%s\n\n", string(s))
+func getRequestServiceEndpoint() string {
+	serverAddress := os.Args[1]
+	requestServicePort := os.Args[2]
+	return fmt.Sprintf("%s:%s", serverAddress, requestServicePort) // Returns Endpoint as <ip-address>:<port>
+}
+
+func getSubscriptionServiceEndpoint() string {
+	serverAddress := os.Args[1]
+	subscriptionServicePort := os.Args[3]
+	return fmt.Sprintf("%s:%s", serverAddress, subscriptionServicePort) // Returns Endpoint as <ip-address>:<port>
+}
+
+func makeTopologyRequests(rsClient jagw.RequestServiceClient) {
+	// Just for demo purposes:
+	// Use as stdin scanner to wait for user input before continuing to next request
+	input := bufio.NewScanner(os.Stdin)
+
+	// Make requests
+	fmt.Print("Press 'Enter' to: REQUEST ALL NODES")
+	input.Scan()
+	fetch.GetAllNodes(rsClient)
+	
+	fmt.Print("Press 'Enter' to: REQUEST SPECIFIC NODES AND SPECIFIC PROPERTIES")
+	input.Scan()
+	fetch.GetSpecificNodes(rsClient)
 }
+
+func makeTelemetryRequests(rsClient jagw.RequestServiceClient) {
+	// Just for demo purposes:
+	// Use as stdin scanner to wait for user input before continuing to next request
+	input := bufio.NewScanner(os.Stdin)
+
+	// Make requests
+	fmt.Print("Press 'Enter' to: REQUEST DATA RATES OF PAST 60 SECONDS OF SPECIFIC NODE")
+	input.Scan()
+	fetch.GetDataRatesOfSpecificNode(rsClient)
+}
+
+func makeTopologySubscriptions(ssClient jagw.SubscriptionServiceClient) {
+	// Just for demo purposes:
+	// Use as stdin scanner to wait for user input before continuing to next request
+	input := bufio.NewScanner(os.Stdin)
+
+	// Make subscriptions
+	fmt.Print("Press 'Enter' to: SUBSCRIBE TO ALL LINKS")
+	input.Scan()
+	fetch.SubscribeToAllLinks(ssClient)
+
+	fmt.Print("Press 'Enter' to: SUBSCRIBE TO SPECIFIC LINK")
+	input.Scan()
+	fetch.SubscribeToSpecificLink(ssClient)
+}
+
+func makeTelemetrySubscriptions(ssClient jagw.SubscriptionServiceClient) {
+	// Just for demo purposes:
+	// Use as stdin scanner to wait for user input before continuing to next request
+	input := bufio.NewScanner(os.Stdin)
+
+	// Make subscriptions
+	fmt.Print("Press 'Enter' to: SUBSCRIBE TO TELEMETRY DATA OF SPECIFIC NODE")
+	input.Scan()
+	fetch.SubscribeToTelemetryDataOfSpecificNode(ssClient)
+}