What Causes Yellow Discharge With Bad Odor With Lumps On The Vagina?

Okay so I have yellow smelly discharge and I have bumps on my vigina lips 2 big ones on each side my clitoris is swollen with read bumps I also have bumps by muly viginal opening and bum. I went to the doctor and from my pee he said it's urinal tract infection something like that. Now the bumps on my lips bleed a little and hurt alot. The one on my clitoris itch.I am sexual active and the only person I had sex with got tested and doesn't have any stds. I'm still scared and worried it might be a sexual transmitted diese. Can you please help