diff --git a/cmd/lk/simulate.go b/cmd/lk/simulate.go index be1bce5a..62b45ce4 100644 --- a/cmd/lk/simulate.go +++ b/cmd/lk/simulate.go @@ -180,12 +180,12 @@ var simulateAudioCommand = &cli.Command{ Usage: "Call this `NUMBER` over SIP and simulate against whoever answers, instead of dispatching an agent. Requires --from-phone-number and --scenarios.", }, &cli.StringFlag{ - Name: "from-trunk", + Name: "trunk", Usage: "Outbound SIP trunk `ID` to place --to-phone-number calls through. Without it, calls go out from a LiveKit phone number.", }, &cli.StringFlag{ Name: "from-phone-number", - Usage: "Caller `NUMBER` for --to-phone-number calls: a LiveKit phone number the project owns, or a number on --from-trunk", + Usage: "Caller `NUMBER` for --to-phone-number calls: a LiveKit phone number the project owns, or a number on --trunk", }, }, } @@ -539,14 +539,14 @@ func runSimulate(ctx context.Context, cmd *cli.Command, simulationMode livekit.S samples := int32(cmd.Int("samples")) passRate := cmd.Float("pass-rate") liveAgentName := cmd.String("agent-name") - var phoneNumber, fromTrunk, fromPhoneNumber string + var phoneNumber, trunkID, fromPhoneNumber string if simulationMode == livekit.SimulationMode_SIMULATION_MODE_AUDIO { phoneNumber = cmd.String("to-phone-number") - fromTrunk = cmd.String("from-trunk") + trunkID = cmd.String("trunk") fromPhoneNumber = cmd.String("from-phone-number") } - if fromTrunk != "" && phoneNumber == "" { - return fmt.Errorf("--from-trunk requires --to-phone-number") + if trunkID != "" && phoneNumber == "" { + return fmt.Errorf("--trunk requires --to-phone-number") } if fromPhoneNumber != "" && phoneNumber == "" { return fmt.Errorf("--from-phone-number requires --to-phone-number") @@ -668,7 +668,7 @@ func runSimulate(ctx context.Context, cmd *cli.Command, simulationMode livekit.S simCfg.lowQualityMicrophone = cmd.Bool("low-quality-microphone") simCfg.packetLoss = cmd.Bool("packet-loss") simCfg.sipCallTo = phoneNumber - simCfg.sipTrunkID = fromTrunk + simCfg.sipTrunkID = trunkID simCfg.sipNumber = fromPhoneNumber } diff --git a/cmd/lk/sip.go b/cmd/lk/sip.go index cfdea76c..0467eda5 100644 --- a/cmd/lk/sip.go +++ b/cmd/lk/sip.go @@ -336,12 +336,14 @@ var ( Usage: "`SIP_TRUNK_ID` to use for the call (overrides json config)", }, &cli.StringFlag{ - Name: "number", - Usage: "`SIP_NUMBER` to use for the call (overrides json config)", + Name: "from-phone-number", + Aliases: []string{"number"}, + Usage: "`SIP_NUMBER` to use for the call (overrides json config)", }, &cli.StringFlag{ - Name: "call", - Usage: "`SIP_CALL_TO` number to use (overrides json config)", + Name: "to-phone-number", + Aliases: []string{"call"}, + Usage: "`SIP_CALL_TO` number to use (overrides json config)", }, &cli.StringFlag{ Name: "name", @@ -1273,10 +1275,10 @@ func createSIPParticipant(ctx context.Context, cmd *cli.Command) error { if v := cmd.String("trunk"); v != "" { req.SipTrunkId = v } - if v := cmd.String("number"); v != "" { + if v := cmd.String("from-phone-number"); v != "" { req.SipNumber = v } - if v := cmd.String("call"); v != "" { + if v := cmd.String("to-phone-number"); v != "" { req.SipCallTo = v } if v := cmd.String("room"); v != "" {