feat: Add CLI for simple gateway registration

Signed-off-by: Christine Wang <christinewang@fb.com>

orc8r/cloud/docker/controller/supervisord.conf

@@ -31,7 +31,7 @@ stdout_events_enabled=true
 stderr_events_enabled=true
 
 [program:bootstrapper]
-command=/usr/bin/envdir /var/opt/magma/envdir /var/opt/magma/bin/bootstrapper -cak=/var/opt/magma/certs/bootstrapper.key -logtostderr=true -v=0
+command=/usr/bin/envdir /var/opt/magma/envdir /var/opt/magma/bin/bootstrapper -cak=/var/opt/magma/certs/bootstrapper.key -logtostderr=true -v=10
 autorestart=true
 stdout_logfile=NONE
 stderr_logfile=NONE
@@ -143,7 +143,7 @@ stdout_events_enabled=true
 stderr_events_enabled=true
 
 [program:obsidian]
-command=/usr/bin/envdir /var/opt/magma/envdir /var/opt/magma/bin/obsidian -logtostderr=true -v=0
+command=/usr/bin/envdir /var/opt/magma/envdir /var/opt/magma/bin/obsidian -logtostderr=true -v=10
 autorestart=true
 stdout_logfile=NONE
 stderr_logfile=NONE

orc8r/cloud/go/services/bootstrapper/servicers/registration/registration.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-openapi/strfmt"
+	"github.com/golang/glog"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -33,25 +34,30 @@ func NewRegistrationServicer() protos.RegistrationServer {
 }
 
 func (r *RegistrationService) Register(c context.Context, request *protos.RegisterRequest) (*protos.RegisterResponse, error) {
+	glog.Errorf("christinewang5 --- in Register function")
 	nonce, err := NonceFromToken(request.Token)
 	if err != nil {
+		glog.Errorf("christinewang5 --- NonceFromToken %v", err)
 		return nil, err
 	}
 
 	deviceInfo, err := r.GetGatewayDeviceInfo(context.Background(), nonce)
 	if err != nil {
+		glog.Errorf("christinewang5 ---  r.GetGatewayDeviceInfo %v", err)
 		clientErr := makeErr(fmt.Sprintf("could not get device info from token %v: %v", request.Token, err))
 		return clientErr, nil
 	}
 
 	err = r.RegisterDevice(*deviceInfo, request.Hwid, request.ChallengeKey)
 	if err != nil {
+		glog.Errorf("christinewang5 ---  r.RegisterDevice %v", err)
 		clientErr := makeErr(fmt.Sprintf("error registering device: %v", err))
 		return clientErr, nil
 	}
 
 	controlProxy, err := r.GetControlProxy(deviceInfo.NetworkId)
 	if err != nil {
+		glog.Errorf("christinewang5 ---  r.GetControlProxy %v", err)
 		clientErr := makeErr(fmt.Sprintf("error getting control proxy: %v", err))
 		return clientErr, nil
 	}

orc8r/gateway/python/magma/common/service_registry.py

@@ -85,6 +85,24 @@ def reset():
         """
         ServiceRegistry.get_registry()["services"] = {}
 
+    @staticmethod
+    def get_bare_rpc_channel(service):
+        authority = '%s-%s' % (service, 'bootstrapper')
+
+        grpc_options = [("grpc.keepalive_time_ms", GRPC_KEEPALIVE_MS)]
+
+        # Connect to the cloud directly
+        # ssl_creds = get_ssl_creds()
+        ip = '127.0.0.1'
+        port = '8444'
+        channel = create_grpc_channel(
+            ip, port, authority,
+            ssl_creds=None,
+            options=grpc_options,
+        )
+
+        return channel
+
     @staticmethod
     def get_bootstrap_rpc_channel():
         """
@@ -283,6 +301,7 @@ def create_grpc_channel(ip, port, authority, ssl_creds=None, options=None):
     Returns:
         grpc channel
     """
+    print('christinewang5 what is ip and port? %s %s', ip, port)
     grpc_options = [('grpc.default_authority', authority)]
     if options is not None:
         grpc_options.extend(options)

orc8r/gateway/python/scripts/register.py

@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+"""
+Copyright 2020 The Magma Authors.
+
+This source code is licensed under the BSD-style license found in the
+LICENSE file in the root directory of this source tree.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import argparse
+import grpc
+import snowflake
+
+from magma.common.cert_utils import load_public_key_to_base64der
+from orc8r.protos.bootstrapper_pb2 import (
+    RegisterRequest,
+    GetGatewayDeviceInfoRequest,
+)
+from orc8r.protos.bootstrapper_pb2_grpc import (
+    RegistrationStub,  # Register
+    CloudRegistrationStub,  # Register
+)
+from magma.common.service_registry import ServiceRegistry
+
+from magma.common.rpc_utils import cloud_grpc_wrapper
+
+BOOTSTRAPPER_SERVICE_NAME = "bootstrapper"
+
+
+def bare_grpc_wrapper(func):
+    """
+    Wraps a function with a gRPC wrapper which creates a RPC client to
+    the service and handles any RPC Exceptions.
+
+    Usage:
+    @cloud_grpc_wrapper
+    def func(client, args):
+        pass
+    func(args, ProtoStubClass, 'service')
+    """
+
+    def wrapper(*alist):
+        args = alist[0]
+        stub_cls = alist[1]
+        service = alist[2]
+        chan = ServiceRegistry.get_bare_rpc_channel(service)
+        client = stub_cls(chan)
+        try:
+            func(client, args)
+        except grpc.RpcError as err:
+            print("Error! [%s] %s" % (err.code(), err.details()))
+            exit(1)
+
+    return wrapper
+
+
+@cloud_grpc_wrapper
+def register_handler(client, args):
+    req = RegisterRequest()
+    req.token = args.token
+    req.hwid.id = snowflake.snowflake()
+    req.challenge_key.key = load_public_key_to_base64der(
+        "/var/opt/magma/certs/gw_challenge.key")
+    req.challenge_key.key_type = 0
+    # TODO: what is req.challenge_key.key_type?
+    print("christinewang5 req \n--- \n", req)
+    print(client)
+    res = client.Register(req)
+    print("christinewang5 res \t---\t", res)
+
+    print("Successfully registered gateway")
+    print("Hardware ID\n-----------\n{}\n", req.hwid)
+    print("Challenge Key\n-----------\n{}\n", req.challenge_key)
+    # NOTE: returns oneof(err, control_proxy)
+    return res
+
+
+@bare_grpc_wrapper
+def get_gateway_device_info_handler(client, args):
+    device_info_request = GetGatewayDeviceInfoRequest()
+    device_info_request.token = args.token
+    res = client.GetGatewayDeviceInfo(device_info_request)
+    print(res)
+    print("Successfully retrieved gateway device info")
+    # TODO(christinewang): maybe print nicer messages
+    # NOTE: returns oneof(GatewayDeviceInfo, error)
+    # GatewayDeviceInfo: network_id, logical_id
+    return res
+
+
+def main():
+    """Register a gateway"""
+    parser = argparse.ArgumentParser(description="Register a gateway.")
+    parser.add_argument(
+        "domain",
+        metavar="DOMAIN_NAME",
+        type=str,
+        help="orc8r's domain name",
+    )
+    parser.add_argument(
+        "token",
+        metavar="REGISTRATION_TOKEN",
+        type=str,
+        help="registration token after API call",
+    )
+    parser.add_argument(
+        "--ca_file",
+        type=str,
+        help="orc8r's root CA file"
+    )
+    args = parser.parse_args()
+    res = register_handler(args, RegistrationStub, BOOTSTRAPPER_SERVICE_NAME)
+    print("what is happening %s", res)
+
+    # device_info_res = get_gateway_device_info_handler(args, CloudRegistrationStub, BOOTSTRAPPER_SERVICE_NAME)
+
+
+if __name__ == "__main__":
+    main()

orc8r/gateway/python/setup.py

@@ -52,6 +52,7 @@
         'scripts/magma_conditional_service.py',
         'scripts/magma_get_config.py',
         'scripts/magmad_cli.py',
+        'scripts/register.py',
         'scripts/service_util.py',
         'scripts/service303_cli.py',
         'scripts/show_gateway_info.py',